Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Enable receiver for update user sensitive""" into rvc-dev

Browse Source
This commit is contained in:
Nate Myren
2020-04-07 22:17:25 +00:00
committed by Android (Google) Code Review
parent e68c8ac02b d15dcf9d97
commit ffafac570f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -30,6 +30,7 @@ import android.annotation.Nullable;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.AppOpsManagerInternal; import android.app.AppOpsManagerInternal;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
@@ -47,6 +48,7 @@ import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManagerInternal; import android.os.UserManagerInternal;
import android.permission.PermissionControllerManager; import android.permission.PermissionControllerManager;
import android.provider.Settings;
import android.provider.Telephony; import android.provider.Telephony;
import android.telecom.TelecomManager; import android.telecom.TelecomManager;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -70,7 +72,9 @@ import com.android.server.pm.permission.PermissionManagerServiceInternal;
import com.android.server.policy.PermissionPolicyInternal.OnInitializedCallback; import com.android.server.policy.PermissionPolicyInternal.OnInitializedCallback;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
/** /**
@@ -180,8 +184,6 @@ public final class PermissionPolicyService extends SystemService {
intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED); intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
intentFilter.addDataScheme("package"); intentFilter.addDataScheme("package");
/* TODO ntmyren: enable receiver when test flakes are fixed
getContext().registerReceiverAsUser(new BroadcastReceiver() { getContext().registerReceiverAsUser(new BroadcastReceiver() {
final List<Integer> mUserSetupUids = new ArrayList<>(200); final List<Integer> mUserSetupUids = new ArrayList<>(200);
final Map<UserHandle, PermissionControllerManager> mPermControllerManagers = final Map<UserHandle, PermissionControllerManager> mPermControllerManagers =
@@ -232,7 +234,6 @@ public final class PermissionPolicyService extends SystemService {
manager.updateUserSensitiveForApp(uid); manager.updateUserSensitiveForApp(uid);
} }
}, UserHandle.ALL, intentFilter, null, null); }, UserHandle.ALL, intentFilter, null, null);
*/
} }
/** /**