summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2020-04-01 17:29:04 +0000
committer Nate Myren <ntmyren@google.com> 2020-04-02 16:57:19 +0000
commit3662e738167e5fdc74b674f824675280cb1f6e7e (patch)
tree72820520cbb260b9cc4cea098b57d560be56c6c4
parent5757effce104d28726969138c3e987800bd75cd4 (diff)
Revert "Enable receiver for update user sensitive"
This reverts commit 5757effce104d28726969138c3e987800bd75cd4. Reason for revert: Concurrency issues and DeadSystemExceptions Fixes: 153048972 Fixes: 152974577 Fixes: 151886002 Change-Id: I5a8863160b32c0abdf1612b72754b169f1708204
-rw-r--r--services/core/java/com/android/server/policy/PermissionPolicyService.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java
index 27288d852fb2..161f30449a52 100644
--- a/services/core/java/com/android/server/policy/PermissionPolicyService.java
+++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java
@@ -30,7 +30,6 @@ import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.AppOpsManager;
import android.app.AppOpsManagerInternal;
-import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -48,7 +47,6 @@ import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManagerInternal;
import android.permission.PermissionControllerManager;
-import android.provider.Settings;
import android.provider.Telephony;
import android.telecom.TelecomManager;
import android.util.ArrayMap;
@@ -72,9 +70,7 @@ import com.android.server.pm.permission.PermissionManagerServiceInternal;
import com.android.server.policy.PermissionPolicyInternal.OnInitializedCallback;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.ExecutionException;
/**
@@ -184,6 +180,8 @@ public final class PermissionPolicyService extends SystemService {
intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
intentFilter.addDataScheme("package");
+
+ /* TODO ntmyren: enable receiver when test flakes are fixed
getContext().registerReceiverAsUser(new BroadcastReceiver() {
final List<Integer> mUserSetupUids = new ArrayList<>(200);
final Map<UserHandle, PermissionControllerManager> mPermControllerManagers =
@@ -234,6 +232,7 @@ public final class PermissionPolicyService extends SystemService {
manager.updateUserSensitiveForApp(uid);
}
}, UserHandle.ALL, intentFilter, null, null);
+ */
}
/**