forked from mirrors/gecko-dev
Bug 1469309 - Remove an unused sensor type; r=agaynor
--HG-- extra : source : 12d7dd36b8ccb80e866d0da7fcb7e44fcb690b0b extra : histedit_source : b5aedb2bcf0adc8ce650124544cebd82cecbdc33
This commit is contained in:
parent
c73d6a6cda
commit
6390ab3471
3 changed files with 5 additions and 5 deletions
|
|
@ -429,6 +429,7 @@ UnregisterSensorObserver(SensorType aSensor, ISensorObserver *aObserver) {
|
|||
AssertMainThread();
|
||||
|
||||
if (!gSensorObservers) {
|
||||
HAL_ERR("Un-registering a sensor when none have been registered");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ namespace hal {
|
|||
* If you add or change any here, do the same in GeckoHalDefines.java.
|
||||
*/
|
||||
enum SensorType {
|
||||
SENSOR_UNKNOWN = -1,
|
||||
SENSOR_ORIENTATION = 0,
|
||||
SENSOR_ACCELERATION = 1,
|
||||
SENSOR_PROXIMITY = 2,
|
||||
|
|
@ -51,7 +50,7 @@ namespace IPC {
|
|||
struct ParamTraits<mozilla::hal::SensorType>:
|
||||
public ContiguousEnumSerializer<
|
||||
mozilla::hal::SensorType,
|
||||
mozilla::hal::SENSOR_UNKNOWN,
|
||||
mozilla::hal::SENSOR_ORIENTATION,
|
||||
mozilla::hal::NUM_SENSOR_TYPE> {
|
||||
};
|
||||
} // namespace IPC
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include "mozilla/dom/network/Types.h"
|
||||
#include "mozilla/dom/ScreenOrientation.h"
|
||||
#include "mozilla/fallback/FallbackScreenConfiguration.h"
|
||||
#include "mozilla/EnumeratedRange.h"
|
||||
#include "mozilla/Observer.h"
|
||||
#include "mozilla/Unused.h"
|
||||
#include "nsAutoPtr.h"
|
||||
|
|
@ -232,9 +233,8 @@ public:
|
|||
hal::UnregisterBatteryObserver(this);
|
||||
hal::UnregisterNetworkObserver(this);
|
||||
hal::UnregisterScreenConfigurationObserver(this);
|
||||
for (int32_t sensor = SENSOR_UNKNOWN + 1;
|
||||
sensor < NUM_SENSOR_TYPE; ++sensor) {
|
||||
hal::UnregisterSensorObserver(SensorType(sensor), this);
|
||||
for (auto sensor : MakeEnumeratedRange(NUM_SENSOR_TYPE)) {
|
||||
hal::UnregisterSensorObserver(sensor, this);
|
||||
}
|
||||
hal::UnregisterWakeLockObserver(this);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue