commit 85be0c4e21ba6a2b74a8546403c6da03a343e5aa
author Svet Ganov <svetoslavganov@google.com> Fri Jul 03 16:22:26 2015 -0700
committer Svet Ganov <svetoslavganov@google.com> Fri Jul 03 16:23:19 2015 -0700
tree 90c93f8db7b0aa0cc74dc7c6628640ffabbe0c50
parent a7bdb6c99b7ddb6e17f9c939c138686e0bfdbbc4

Fix app ops aidl as it is also used from native.

bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6

core/java/com/android/internal/app/IAppOpsService.aidl

diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl
index 201a124..73c4833 100644
--- a/core/java/com/android/internal/app/IAppOpsService.aidl
+++ b/core/java/com/android/internal/app/IAppOpsService.aidl
@@ -25,14 +25,14 @@
     // be kept in sync with frameworks/native/include/binder/IAppOpsService.h
     int checkOperation(int code, int uid, String packageName);
     int noteOperation(int code, int uid, String packageName);
-    int noteProxyOperation(int code, String proxyPackageName,
-            int callingUid, String callingPackageName);
     int startOperation(IBinder token, int code, int uid, String packageName);
     void finishOperation(IBinder token, int code, int uid, String packageName);
     void startWatchingMode(int op, String packageName, IAppOpsCallback callback);
     void stopWatchingMode(IAppOpsCallback callback);
     IBinder getToken(IBinder clientToken);
     int permissionToOpCode(String permission);
+    int noteProxyOperation(int code, String proxyPackageName,
+                int callingUid, String callingPackageName);
 
     // Remaining methods are only used in Java.
     int checkPackage(int uid, String packageName);