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

Merge "Handle USER_ALL in instant apps call" into qt-dev

Browse Source 
am: 58b7cf731d

Change-Id: I01821e3952b6e7e3caba3c2c4e2538a980208efb
This commit is contained in:
Julia Reynolds
2019-06-22 17:35:58 -07:00
committed by android-build-merger
parent c736f0a15c 58b7cf731d
commit c0030892d8
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7151,6 +7151,10 @@ public class NotificationManagerService extends SystemService {
return false;
}
if (userId == UserHandle.USER_ALL) {
userId = USER_SYSTEM;
}
try {
final String[] pkgs = mPackageManager.getPackagesForUid(callingUid);
if (pkgs == null) {

14
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -3806,6 +3806,20 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
assertTrue(mService.isCallerInstantApp(68638450, 10));
}
@Test
public void testIsCallerInstantApp_userAllNotification() throws Exception {
ApplicationInfo info = new ApplicationInfo();
info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;
when(mPackageManager.getApplicationInfo(anyString(), anyInt(), eq(UserHandle.USER_SYSTEM)))
.thenReturn(info);
when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(new String[]{"any"});
assertTrue(mService.isCallerInstantApp(45770, UserHandle.USER_ALL));
info.privateFlags = 0;
assertFalse(mService.isCallerInstantApp(575370, UserHandle.USER_ALL ));
}
@Test
public void testResolveNotificationUid_sameApp_nonSystemUser() throws Exception {
ApplicationInfo info = new ApplicationInfo();