commit e88a85e0d0a25c943e974114557770ba10b81847
author Eino-Ville Talvala <etalvala@google.com> Tue Feb 19 12:54:57 2013 -0800
committer Eino-Ville Talvala <etalvala@google.com> Tue Feb 19 18:10:05 2013 -0800
tree d8872089aea8322195ac333e576a3c9407ac6c60
parent c4905eb49d20667381f3cda7c6f6894234404bd3

Fixes to native app ops services

Bug: 8181262
Change-Id: I3d3f20453f6c6f2756c988363c5b5453ef309cb6

include/binder/AppOpsManager.h

diff --git a/include/binder/AppOpsManager.h b/include/binder/AppOpsManager.h
index f64d5da..256cb94 100644
--- a/include/binder/AppOpsManager.h
+++ b/include/binder/AppOpsManager.h
@@ -28,9 +28,9 @@
 {
 public:
     enum {
-        MODE_ALLOWED = 0,
-        MODE_IGNORED = 1,
-        MODE_ERRORED = 2
+        MODE_ALLOWED = IAppOpsService::MODE_ALLOWED,
+        MODE_IGNORED = IAppOpsService::MODE_IGNORED,
+        MODE_ERRORED = IAppOpsService::MODE_ERRORED
     };
 
     enum {

include/binder/IAppOpsService.h

diff --git a/include/binder/IAppOpsService.h b/include/binder/IAppOpsService.h
index 2883e38..7cb55e5 100644
--- a/include/binder/IAppOpsService.h
+++ b/include/binder/IAppOpsService.h
@@ -46,6 +46,12 @@
         START_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+4,
         STOP_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+5
     };
+
+    enum {
+        MODE_ALLOWED = 0,
+        MODE_IGNORED = 1,
+        MODE_ERRORED = 2
+    };
 };
 
 // ----------------------------------------------------------------------
@@ -64,4 +70,3 @@
 }; // namespace android
 
 #endif // ANDROID_IAPP_OPS_SERVICE_H
-