diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-05-01 23:10:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 23:10:56 +0000 |
| commit | c28fe8f5c54c5e98be7664dcffdbd5b324b850d6 (patch) | |
| tree | e767fa8dffa041373996bf2e5d0951e26f3331f6 /include/gui | |
| parent | 326842fca4883f1256aa9ed019bb3206ee76fca7 (diff) | |
| parent | b412f6e203b38f8047f760261a5e3dc6d0722f08 (diff) | |
| download | frameworks_native-c28fe8f5c54c5e98be7664dcffdbd5b324b850d6.zip frameworks_native-c28fe8f5c54c5e98be7664dcffdbd5b324b850d6.tar.gz frameworks_native-c28fe8f5c54c5e98be7664dcffdbd5b324b850d6.tar.bz2 | |
Merge "Add body sensors app op - framework native" into mnc-dev
Diffstat (limited to 'include/gui')
| -rw-r--r-- | include/gui/ISensorServer.h | 4 | ||||
| -rw-r--r-- | include/gui/Sensor.h | 4 | ||||
| -rw-r--r-- | include/gui/SensorEventQueue.h | 3 | ||||
| -rw-r--r-- | include/gui/SensorManager.h | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/include/gui/ISensorServer.h b/include/gui/ISensorServer.h index ee3484c..4feb6db 100644 --- a/include/gui/ISensorServer.h +++ b/include/gui/ISensorServer.h @@ -37,9 +37,9 @@ class ISensorServer : public IInterface public: DECLARE_META_INTERFACE(SensorServer); - virtual Vector<Sensor> getSensorList() = 0; + virtual Vector<Sensor> getSensorList(const String16& opPackageName) = 0; virtual sp<ISensorEventConnection> createSensorEventConnection(const String8& packageName, - int mode) = 0; + int mode, const String16& opPackageName) = 0; virtual status_t enableDataInjection(int enable) = 0; }; diff --git a/include/gui/Sensor.h b/include/gui/Sensor.h index 27a215e..8142be6 100644 --- a/include/gui/Sensor.h +++ b/include/gui/Sensor.h @@ -71,6 +71,8 @@ public: uint32_t getFifoMaxEventCount() const; const String8& getStringType() const; const String8& getRequiredPermission() const; + bool isRequiredPermissionRuntime() const; + int32_t getRequiredAppOp() const; int32_t getMaxDelay() const; uint32_t getFlags() const; bool isWakeUpSensor() const; @@ -97,6 +99,8 @@ private: uint32_t mFifoMaxEventCount; String8 mStringType; String8 mRequiredPermission; + bool mRequiredPermissionRuntime = false; + int32_t mRequiredAppOp; int32_t mMaxDelay; uint32_t mFlags; static void flattenString8(void*& buffer, size_t& size, const String8& string8); diff --git a/include/gui/SensorEventQueue.h b/include/gui/SensorEventQueue.h index b70957b..e5b9fc5 100644 --- a/include/gui/SensorEventQueue.h +++ b/include/gui/SensorEventQueue.h @@ -23,6 +23,7 @@ #include <utils/Errors.h> #include <utils/RefBase.h> #include <utils/Timers.h> +#include <utils/String16.h> #include <gui/BitTube.h> @@ -52,7 +53,7 @@ public: enum { MAX_RECEIVE_BUFFER_EVENT_COUNT = 256 }; - SensorEventQueue(const sp<ISensorEventConnection>& connection); + SensorEventQueue(const sp<ISensorEventConnection>& connection); virtual ~SensorEventQueue(); virtual void onFirstRef(); diff --git a/include/gui/SensorManager.h b/include/gui/SensorManager.h index 4cabf59..d0c63d4 100644 --- a/include/gui/SensorManager.h +++ b/include/gui/SensorManager.h @@ -44,11 +44,10 @@ class SensorEventQueue; // ---------------------------------------------------------------------------- class SensorManager : - public ASensorManager, - public Singleton<SensorManager> + public ASensorManager { public: - SensorManager(); + SensorManager(const String16& opPackageName); ~SensorManager(); ssize_t getSensorList(Sensor const* const** list) const; @@ -68,6 +67,7 @@ private: mutable Sensor const** mSensorList; mutable Vector<Sensor> mSensors; mutable sp<IBinder::DeathRecipient> mDeathObserver; + const String16 mOpPackageName; }; // ---------------------------------------------------------------------------- |