Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c28fe8f5 authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "Add body sensors app op - framework native" into mnc-dev

parents 326842fc b412f6e2

include/android/sensor.h

+0 −11
Original line number Diff line number Diff line
@@ -192,17 +192,6 @@ typedef ASensorRef const* ASensorList; 


/*****************************************************************************/



/*

 * Get a reference to the sensor manager. ASensorManager is a singleton.

 *

 * Example:

 *

 *     ASensorManager* sensorManager = ASensorManager_getInstance();

 *

 */

ASensorManager* ASensorManager_getInstance();





/*

 * Returns the list of available sensors.

 */

include/binder/AppOpsManager.h

+6 −1
Original line number Diff line number Diff line
@@ -87,7 +87,11 @@ public: 
        OP_ASSIST_STRUCTURE = 49,

        OP_ASSIST_SCREENSHOT = 50,

        OP_READ_PHONE_STATE = 51,

        OP_ADD_VOICEMAIL = 52

        OP_ADD_VOICEMAIL = 52,

        OP_USE_SIP = 53,

        OP_PROCESS_OUTGOING_CALLS = 54,

        OP_USE_FINGERPRINT = 55,

        OP_BODY_SENSORS = 56

    };



    AppOpsManager();
@@ -99,6 +103,7 @@ public: 
    void startWatchingMode(int32_t op, const String16& packageName,

            const sp<IAppOpsCallback>& callback);

    void stopWatchingMode(const sp<IAppOpsCallback>& callback);

    int32_t permissionToOpCode(const String16& permission);



private:

    Mutex mLock;

include/binder/IAppOpsService.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public: 
            const sp<IAppOpsCallback>& callback) = 0;

    virtual void stopWatchingMode(const sp<IAppOpsCallback>& callback) = 0;

    virtual sp<IBinder> getToken(const sp<IBinder>& clientToken) = 0;

    virtual int32_t permissionToOpCode(const String16& permission) = 0;



    enum {

        CHECK_OPERATION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,
@@ -49,6 +50,7 @@ public: 
        START_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+4,

        STOP_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+5,

        GET_TOKEN_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+6,

        PERMISSION_TO_OP_CODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+7,

    };



    enum {

include/binder/IPermissionController.h

+4 −1
Original line number Diff line number Diff line
@@ -34,9 +34,12 @@ public: 


    virtual void getPackagesForUid(const uid_t uid, Vector<String16> &packages) = 0;



    virtual bool isRuntimePermission(const String16& permission) = 0;



    enum {

        CHECK_PERMISSION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,

        GET_PACKAGES_FOR_UID_TRANSACTION = CHECK_PERMISSION_TRANSACTION + 1

        GET_PACKAGES_FOR_UID_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION + 1,

        IS_RUNTIME_PERMISSION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION + 2

    };

};

include/gui/ISensorServer.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

};