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

Merge "DO NOT MERGE Add list of approved services in addApprovedList" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-23 19:13:00 +00:00
committed by Android (Google) Code Review
parent 9d5eb3453f 60efeb64cd
commit 7f352dbeaf
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,9 +71,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
/** /**
* Manages the lifecycle of application-provided services bound by system server. * Manages the lifecycle of application-provided services bound by system server.
@@ -401,15 +399,20 @@ abstract public class ManagedServices {
approvedByType = new ArrayMap<>(); approvedByType = new ArrayMap<>();
mApproved.put(userId, approvedByType); mApproved.put(userId, approvedByType);
} }
ArraySet<String> approvedList = approvedByType.get(isPrimary);
if (approvedList == null) {
approvedList = new ArraySet<>();
approvedByType.put(isPrimary, approvedList);
}
String[] approvedArray = approved.split(ENABLED_SERVICES_SEPARATOR); String[] approvedArray = approved.split(ENABLED_SERVICES_SEPARATOR);
final ArraySet<String> approvedList = new ArraySet<>();
for (String pkgOrComponent : approvedArray) { for (String pkgOrComponent : approvedArray) {
String approvedItem = getApprovedValue(pkgOrComponent); String approvedItem = getApprovedValue(pkgOrComponent);
if (approvedItem != null) { if (approvedItem != null) {
approvedList.add(approvedItem); approvedList.add(approvedItem);
} }
} }
approvedByType.put(isPrimary, approvedList);
} }
protected boolean isComponentEnabledForPackage(String pkg) { protected boolean isComponentEnabledForPackage(String pkg) {

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

@@ -266,6 +266,32 @@ public class ManagedServicesTest extends UiServiceTestCase {
} }
} }
@Test
public void testReadXml_appendsListOfApprovedComponents() throws Exception {
for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles,
mIpm, approvalLevel);
String preApprovedPackage = "some.random.package";
String preApprovedComponent = "some.random.package/C1";
List<String> packages = new ArrayList<>();
packages.add(preApprovedPackage);
addExpectedServices(service, packages, 0);
service.setPackageOrComponentEnabled(preApprovedComponent, 0, true, true);
loadXml(service);
verifyExpectedApprovedEntries(service);
String verifyValue = (approvalLevel == APPROVAL_BY_COMPONENT)
? preApprovedComponent
: preApprovedPackage;
assertTrue(service.isPackageOrComponentAllowed(verifyValue, 0));
}
}
@Test @Test
public void testWriteXml_trimsMissingServices() throws Exception { public void testWriteXml_trimsMissingServices() throws Exception {
for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) { for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {