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

Merge "Allow notifs from the default sms app to be blocked" into qt-dev

Browse Source 
am: aa0eeb3857

Change-Id: Ia05ab6c68b4734dfaa4016b6b06f2c8305be56ff
This commit is contained in:
Julia Reynolds
2019-05-24 10:27:35 -07:00
committed by android-build-merger
parent 303c8f3ea3 aa0eeb3857
commit 422b9550f7
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -321,7 +321,6 @@ public class NotificationManagerService extends SystemService {
static final String[] NON_BLOCKABLE_DEFAULT_ROLES = new String[] {
RoleManager.ROLE_DIALER,
RoleManager.ROLE_SMS,
RoleManager.ROLE_EMERGENCY
};

19
services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java
View File

@@ -155,8 +155,6 @@ public class RoleObserverTest extends UiServiceTestCase {
dialer0.add("dialer");
List<String> emer0 = new ArrayList<>();
emer0.add("emergency");
List<String> sms10 = new ArrayList<>();
sms10.add("sms");
ArraySet<Pair<String, Integer>> dialer0Pair = new ArraySet<>();
dialer0Pair.add(new Pair("dialer", 30));
@@ -166,9 +164,6 @@ public class RoleObserverTest extends UiServiceTestCase {
emer0Pair.add(new Pair("emergency", 40));
when(mPm.getPackageUid("emergency", MATCH_ALL, 0)).thenReturn(40);
ArraySet<Pair<String, Integer>> sms10Pair = new ArraySet<>();
sms10Pair.add(new Pair("sms", 50));
when(mPm.getPackageUid("sms", MATCH_ALL, 10)).thenReturn(50);
when(mRoleManager.getRoleHoldersAsUser(
ROLE_DIALER,
@@ -178,10 +173,6 @@ public class RoleObserverTest extends UiServiceTestCase {
ROLE_EMERGENCY,
mUsers.get(0).getUserHandle())).
thenReturn(emer0);
when(mRoleManager.getRoleHoldersAsUser(
ROLE_SMS,
mUsers.get(1).getUserHandle())).
thenReturn(sms10);
mRoleObserver.init();
@@ -190,21 +181,12 @@ public class RoleObserverTest extends UiServiceTestCase {
ROLE_DIALER, dialer0.get(0), mUsers.get(0).id));
assertFalse(mRoleObserver.isApprovedPackageForRoleForUser(
ROLE_DIALER, dialer0.get(0), mUsers.get(1).id));
assertFalse(mRoleObserver.isApprovedPackageForRoleForUser(
ROLE_SMS, dialer0.get(0), mUsers.get(1).id));
assertTrue(mRoleObserver.isApprovedPackageForRoleForUser(
ROLE_EMERGENCY, emer0.get(0), mUsers.get(0).id));
assertFalse(mRoleObserver.isApprovedPackageForRoleForUser(
ROLE_EMERGENCY, emer0.get(0), mUsers.get(1).id));
assertFalse(mRoleObserver.isApprovedPackageForRoleForUser(
ROLE_SMS, sms10.get(0), mUsers.get(0).id));
assertFalse(mRoleObserver.isApprovedPackageForRoleForUser(
ROLE_DIALER, sms10.get(0), mUsers.get(0).id));
assertTrue(mRoleObserver.isApprovedPackageForRoleForUser(
ROLE_SMS, sms10.get(0), mUsers.get(1).id));
// make sure we're listening to updates
verify(mRoleManager, times(1)).addOnRoleHoldersChangedListenerAsUser(
eq(mExecutor), any(), eq(UserHandle.ALL));
@@ -212,7 +194,6 @@ public class RoleObserverTest extends UiServiceTestCase {
// make sure we told pref helper about the state of the world
verify(mPreferencesHelper, times(1)).updateDefaultApps(0, null, dialer0Pair);
verify(mPreferencesHelper, times(1)).updateDefaultApps(0, null, emer0Pair);
verify(mPreferencesHelper, times(1)).updateDefaultApps(10, null, sms10Pair);
}
@Test