Merge "Move startWatchingModeWithFlags to the native supported binder calls"...

Merge "Move startWatchingModeWithFlags to the native supported binder calls" into sc-dev am: 54ae55db am: 5514a571

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22465294



Change-Id: Id9c5f868fc92b14b3f10a2d7d66a76a3296c592f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -52,6 +52,8 @@ interface IAppOpsService {
     int checkAudioOperation(int code, int usage, int uid, String packageName);
     boolean shouldCollectNotes(int opCode);
     void setCameraAudioRestriction(int mode);
+    void startWatchingModeWithFlags(int op, String packageName, int flags,
+            IAppOpsCallback callback);
     // End of methods also called by native code.
     // Any new method exposed to native must be added after the last one, do not reorder
 
@@ -110,8 +112,6 @@ interface IAppOpsService {
     void startWatchingStarted(in int[] ops, IAppOpsStartedCallback callback);
     void stopWatchingStarted(IAppOpsStartedCallback callback);
 
-    void startWatchingModeWithFlags(int op, String packageName, int flags, IAppOpsCallback callback);
-
     void startWatchingNoted(in int[] ops, IAppOpsNotedCallback callback);
     void stopWatchingNoted(IAppOpsNotedCallback callback);