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

Commit 132fb229 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes I7748934f,I008ef537,I1027e87f 

* changes:
  Fix constructor parameters shadowing member variables
  Use uint32_t consistently for region op
  Fix trailing semicolon warnings
parents fd9d1fb5 382ecd3d

include/batteryservice/IBatteryPropertiesListener.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ enum { 


class IBatteryPropertiesListener : public IInterface {

public:

    DECLARE_META_INTERFACE(BatteryPropertiesListener);

    DECLARE_META_INTERFACE(BatteryPropertiesListener)



    virtual void batteryPropertiesChanged(struct BatteryProperties props) = 0;

};

include/batteryservice/IBatteryPropertiesRegistrar.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ enum { 


class IBatteryPropertiesRegistrar : public IInterface {

public:

    DECLARE_META_INTERFACE(BatteryPropertiesRegistrar);

    DECLARE_META_INTERFACE(BatteryPropertiesRegistrar)



    virtual void registerListener(const sp<IBatteryPropertiesListener>& listener) = 0;

    virtual void unregisterListener(const sp<IBatteryPropertiesListener>& listener) = 0;

include/binder/IAppOpsCallback.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ namespace android { 
class IAppOpsCallback : public IInterface

{

public:

    DECLARE_META_INTERFACE(AppOpsCallback);

    DECLARE_META_INTERFACE(AppOpsCallback)



    virtual void opChanged(int32_t op, const String16& packageName) = 0;

include/binder/IAppOpsService.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ namespace android { 
class IAppOpsService : public IInterface

{

public:

    DECLARE_META_INTERFACE(AppOpsService);

    DECLARE_META_INTERFACE(AppOpsService)



    virtual int32_t checkOperation(int32_t code, int32_t uid, const String16& packageName) = 0;

    virtual int32_t noteOperation(int32_t code, int32_t uid, const String16& packageName) = 0;

include/binder/IBatteryStats.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ namespace android { 
class IBatteryStats : public IInterface

{

public:

    DECLARE_META_INTERFACE(BatteryStats);

    DECLARE_META_INTERFACE(BatteryStats)



    virtual void noteStartSensor(int uid, int sensor) = 0;

    virtual void noteStopSensor(int uid, int sensor) = 0;