Merge "Fix intermittent async noteOps" into sc-dev

core/java/android/app/AppOpsManager.java

@@ -2783,16 +2783,6 @@ public class AppOpsManager {
      */
     private static final ThreadLocal<Integer> sBinderThreadCallingUid = new ThreadLocal<>();
 
-    /**
-     * Optimization: we need to propagate to IPCs whether the current thread is collecting
-     * app ops but using only the thread local above is too slow as it requires a map lookup
-     * on every IPC. We add this static var that is lockless and stores an OR-ed mask of the
-     * thread id's currently collecting ops, thus reducing the map lookup to a simple bit
-     * operation except the extremely unlikely case when threads with overlapping id bits
-     * execute op collecting ops.
-     */
-    private static volatile long sThreadsListeningForOpNotedInBinderTransaction = 0L;
-
     /**
      * If a thread is currently executing a two-way binder transaction, this stores the
      * ops that were noted blaming any app (the caller, the caller of the caller, etc).
@@ -8903,7 +8893,6 @@ public class AppOpsManager {
      * @hide
      */
     public static void startNotedAppOpsCollection(int callingUid) {
-        sThreadsListeningForOpNotedInBinderTransaction |= Thread.currentThread().getId();
         sBinderThreadCallingUid.set(callingUid);
     }
 
@@ -8918,7 +8907,6 @@ public class AppOpsManager {
      */
     public static void finishNotedAppOpsCollection() {
         sBinderThreadCallingUid.remove();
-        sThreadsListeningForOpNotedInBinderTransaction &= ~Thread.currentThread().getId();
         sAppOpsNotedInThisBinderTransaction.remove();
     }
 
@@ -9263,9 +9251,7 @@ public class AppOpsManager {
      * @return whether we are in a binder transaction and collecting appops.
      */
     private static boolean isListeningForOpNotedInBinderTransaction() {
-        return (sThreadsListeningForOpNotedInBinderTransaction
-                        & Thread.currentThread().getId()) != 0
-                && sBinderThreadCallingUid.get() != null;
+        return sBinderThreadCallingUid.get() != null;
     }
 
     /**