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

Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev am: b6cf707632

Browse Source 
am: de0bdc59e1

Change-Id: Ie2066bfc97c977056fe114332e5bf11ffc468644
This commit is contained in:
Julia Reynolds
2017-08-28 15:23:13 +00:00
committed by android-build-merger
parent 0516e16ec1 de0bdc59e1
commit a76da9e67d
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/notification/ManagedServices.java
View File

@@ -455,6 +455,11 @@ abstract public class ManagedServices {
}
}
public void onUserRemoved(int user) {
mApproved.remove(user);
rebindServices(true);
}
public void onUserSwitched(int user) {
if (DEBUG) Slog.d(TAG, "onUserSwitched u=" + user);
if (Arrays.equals(mLastSeenProfileIds, mUserProfiles.getCurrentProfileIds())) {

7
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -984,12 +984,17 @@ public class NotificationManagerService extends SystemService {
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);
if (userId != USER_NULL) {
mUserProfiles.updateCache(context);
readDefaultApprovedServices(userId);
if (!mUserProfiles.isManagedProfile(userId)) {
readDefaultApprovedServices(userId);
}
}
} else if (action.equals(Intent.ACTION_USER_REMOVED)) {
final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);
mZenModeHelper.onUserRemoved(user);
mRankingHelper.onUserRemoved(user);
mListeners.onUserRemoved(user);
mConditionProviders.onUserRemoved(user);
mAssistants.onUserRemoved(user);
savePolicyFile();
} else if (action.equals(Intent.ACTION_USER_UNLOCKED)) {
final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

30
services/tests/notification/src/com/android/server/notification/ManagedServicesTest.java
View File

@@ -91,6 +91,7 @@ public class ManagedServicesTest extends NotificationTestCase {
private ArrayMap<Integer, String> mExpectedSecondaryPackages;
private ArrayMap<Integer, String> mExpectedSecondaryComponentNames;
// type : user : list of approved
private ArrayMap<Integer, ArrayMap<Integer, String>> mExpectedPrimary = new ArrayMap<>();
private ArrayMap<Integer, ArrayMap<Integer, String>> mExpectedSecondary = new ArrayMap<>();
@@ -578,6 +579,32 @@ public class ManagedServicesTest extends NotificationTestCase {
assertEquals(0, service.getAllowedComponents(10).size());
}
@Test
public void testOnUserRemoved() throws Exception {
for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles,
mIpm, approvalLevel);
loadXml(service);
ArrayMap<Integer, String> verifyMap = mExpectedPrimary.get(service.mApprovalLevel);
String user0 = verifyMap.remove(0);
verifyMap = mExpectedSecondary.get(service.mApprovalLevel);
user0 = user0 + ":" + verifyMap.remove(0);
service.onUserRemoved(0);
for (String verifyValue : user0.split(":")) {
if (!TextUtils.isEmpty(verifyValue)) {
assertFalse("service type " + service.mApprovalLevel + ":" + verifyValue
+ " is still allowed",
service.isPackageOrComponentAllowed(verifyValue, 0));
}
}
verifyExpectedApprovedEntries(service);
}
}
private void loadXml(ManagedServices service) throws Exception {
final StringBuffer xml = new StringBuffer();
xml.append("<" + service.getConfig().xmlTag + ">\n");
@@ -657,7 +684,8 @@ public class ManagedServicesTest extends NotificationTestCase {
for (String packageOrComponent : verifyMap.get(userId).split(":")) {
if (!TextUtils.isEmpty(packageOrComponent)) {
if (service.mApprovalLevel == APPROVAL_BY_PACKAGE) {
assertTrue(packageOrComponent, service.isComponentEnabledForPackage(packageOrComponent));
assertTrue(packageOrComponent,
service.isComponentEnabledForPackage(packageOrComponent));
for (int i = 1; i <= 3; i ++) {
ComponentName componentName = ComponentName.unflattenFromString(
packageOrComponent +"/C" + i);