If you don't hold the {@link android.Manifest.permission#WATCH_APPOPS} permission - * you can watch changes only for your UID. + *
Similar to {@link #startWatchingNoted(String[], Executor, OnOpNotedListener)}, but + * without an executor parameter. * - * @param ops The ops to watch. - * @param callback Where to report changes. + *
Note that the listener will be called on the main thread using + * {@link Context.getMainThread()}. To specify the execution thread, use + * {@link #startWatchingNoted(String[], Executor, OnOpNotedListener)}. * + * @param ops the ops to watch + * @param listener listener to notify when an app op is noted + * + * @see #startWatchingNoted(String[], Executor, OnOpNotedListener) * @see #stopWatchingNoted(OnOpNotedListener) * @see #noteOp(String, int, String, String, String) * @@ -7755,40 +7900,111 @@ public class AppOpsManager { */ @SystemApi @RequiresPermission(value=Manifest.permission.WATCH_APPOPS, conditional=true) - public void startWatchingNoted(@NonNull String[] ops, @NonNull OnOpNotedListener callback) { + public void startWatchingNoted(@NonNull @AppOpString String[] ops, + @NonNull OnOpNotedListener listener) { final int[] intOps = new int[ops.length]; for (int i = 0; i < ops.length; i++) { intOps[i] = strOpToOp(ops[i]); } - startWatchingNoted(intOps, callback); + startWatchingNoted(intOps, listener); } /** - * Start watching for noted app ops. An app op may be immediate or long running. - * Immediate ops are noted while long running ones are started and stopped. This - * method allows registering a listener to be notified when an app op is noted. If - * an op is being noted by any package you will get a callback. To change the - * watched ops for a registered callback you need to unregister and register it again. + * Start watching for noted app ops. * - *
If you don't hold the {@link android.Manifest.permission#WATCH_APPOPS} permission - * you can watch changes only for your UID. + *
An app op may be immediate or long-running. Immediate ops are noted while long-running + * ones are started and stopped. * - * This allows observing noted ops by their raw op codes instead of string op names. + *
This method allows registering a listener to be notified when an app op is noted. To + * change the watched ops for a registered callback you need to unregister and register it + * again. * - * @param ops The ops to watch. - * @param callback Where to report changes. + *
If you don't hold the {@link android.Manifest.permission#WATCH_APPOPS} permission you can + * watch changes only for your UID. + * + * @param ops the ops to watch + * @param executor the executor on which the listener will be notified + * @param listener listener to notify when an app op is noted + * + * @see #startWatchingNoted(String[], OnOpNotedListener) + * @see #stopWatchingNoted(OnOpNotedListener) + * @see #noteOp(String, int, String, String, String) + * + * @hide + */ + @SystemApi + @RequiresPermission(value=Manifest.permission.WATCH_APPOPS, conditional=true) + public void startWatchingNoted(@NonNull @AppOpString String[] ops, + @CallbackExecutor @NonNull Executor executor, @NonNull OnOpNotedListener listener) { + final int[] intOps = new int[ops.length]; + for (int i = 0; i < ops.length; i++) { + intOps[i] = strOpToOp(ops[i]); + } + startWatchingNoted(intOps, executor, listener); + } + + /** + * Start watching for noted app ops. + * + *
Similar to {@link #startWatchingNoted(int[], Executor, OnOpNotedListener)}, but without + * an executor parameter. + * + *
This method is also similar to {@link #startWatchingNoted(String[], OnOpNotedListener)}, + * but allows observing noted ops by their raw op codes instead of string op names. + * + *
Note that the listener will be called on the main thread using + * {@link Context.getMainThread()}. To specify the execution thread, use + * {@link {@link #startWatchingNoted(String[], Executor, OnOpNotedListener)}. + * + * @param ops the ops to watch + * @param listener listener to notify when an app op is noted * * @see #startWatchingActive(int[], OnOpActiveChangedListener) * @see #startWatchingStarted(int[], OnOpStartedListener) * @see #startWatchingNoted(String[], OnOpNotedListener) + * @see #startWatchingNoted(int[], Executor, OnOpNotedListener) + * + * @hide + */ + @RequiresPermission(value=Manifest.permission.WATCH_APPOPS, conditional=true) + public void startWatchingNoted(@NonNull int[] ops, @NonNull OnOpNotedListener listener) { + startWatchingNoted(ops, mContext.getMainExecutor(), listener); + } + + /** + * Start watching for noted app ops. + * + *
This method is similar to + * {@link #startWatchingNoted(String[], Executor, OnOpNotedListener)}, but allows observing + * noted ops by their raw op codes instead of string op names. + * + *
An app op may be immediate or long-running. Immediate ops are noted while long-running + * ones are started and stopped. + * + *
This method allows registering a listener to be notified when an app op is noted. To + * change the watched ops for a registered callback you need to unregister and register it + * again. + * + *
If you don't hold the {@link android.Manifest.permission#WATCH_APPOPS} permission you + * can watch changes only for your UID. + * + * @param ops the ops to watch + * @param executor the executor on which the listener will be notified + * @param listener listener to notify when an app op is noted + * + * @see #startWatchingActive(int[], OnOpActiveChangedListener) + * @see #startWatchingStarted(int[], OnOpStartedListener) + * @see #startWatchingNoted(int[], Executor, OnOpNotedListener) + * @see #startWatchingNoted(String[], OnOpNotedListener) * * @hide */ @RequiresPermission(value=Manifest.permission.WATCH_APPOPS, conditional=true) - public void startWatchingNoted(@NonNull int[] ops, @NonNull OnOpNotedListener callback) { + public void startWatchingNoted(@NonNull int[] ops, + @CallbackExecutor @NonNull Executor executor, @NonNull OnOpNotedListener listener) { IAppOpsNotedCallback cb; synchronized (mNotedWatchers) { - cb = mNotedWatchers.get(callback); + cb = mNotedWatchers.get(listener); if (cb != null) { return; } @@ -7796,13 +8012,21 @@ public class AppOpsManager { @Override public void opNoted(int op, int uid, String packageName, String attributionTag, int flags, int mode) { - if (sAppOpInfos[op].name != null) { - callback.onOpNoted(sAppOpInfos[op].name, uid, packageName, attributionTag, - flags, mode); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> { + if (sAppOpInfos[op].name != null) { + listener.onOpNoted(sAppOpInfos[op].name, uid, packageName, + attributionTag, + flags, mode); + } + }); + } finally { + Binder.restoreCallingIdentity(identity); } } }; - mNotedWatchers.put(callback, cb); + mNotedWatchers.put(listener, cb); } try { mService.startWatchingNoted(ops, cb);