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

Merge "Fix NotificationManagerServiceTest for AAOS." into sc-dev am: 0df0ed7ed8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15099674

Change-Id: I214e9aefe14cc982564cab27921803988ce32bdd
This commit is contained in:
Abhijoy Saha
2021-06-25 17:42:28 +00:00
committed by Automerger Merge Worker
parent 76e38954e1 0df0ed7ed8
commit dd19699e35
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/notification/InlineReplyUriRecord.java
View File

@@ -16,9 +16,11 @@
package com.android.server.notification;
import android.app.ActivityManager;
import android.net.Uri;
import android.os.IBinder;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.ArraySet;
/**
@@ -74,7 +76,9 @@ public final class InlineReplyUriRecord {
*/
public int getUserId() {
int userId = mUser.getIdentifier();
if (userId == UserHandle.USER_ALL) {
if (UserManager.isHeadlessSystemUserMode() && userId == UserHandle.USER_ALL) {
return ActivityManager.getCurrentUser();
} else if (userId == UserHandle.USER_ALL) {
return UserHandle.USER_SYSTEM;
} else {
return userId;

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

@@ -233,6 +233,7 @@ import java.util.function.Consumer;
@RunWithLooper
public class NotificationManagerServiceTest extends UiServiceTestCase {
private static final String TEST_CHANNEL_ID = "NotificationManagerServiceTestChannelId";
private static final int UID_HEADLESS = 1000000;
private final int mUid = Binder.getCallingUid();
private TestableNotificationManagerService mService;
@@ -6758,7 +6759,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test
public void testGrantInlineReplyUriPermission_recordExists() throws Exception {
NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, 0);
int userId = UserManager.isHeadlessSystemUserMode()
? UserHandle.getUserId(UID_HEADLESS)
: USER_SYSTEM;
NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, userId);
mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag",
nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId());
waitForIdle();
@@ -6783,7 +6788,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test
public void testGrantInlineReplyUriPermission_noRecordExists() throws Exception {
NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, 0);
int userId = UserManager.isHeadlessSystemUserMode()
? UserHandle.getUserId(UID_HEADLESS)
: USER_SYSTEM;
NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, userId);
waitForIdle();
// No notifications exist for the given record
@@ -6827,7 +6836,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
// Target user for the grant is USER_ALL instead of USER_SYSTEM
verify(mUgm, times(1)).grantUriPermissionFromOwner(any(),
eq(nr.getSbn().getUid()), eq(nr.getSbn().getPackageName()), eq(uri), anyInt(),
anyInt(), eq(UserHandle.USER_SYSTEM));
anyInt(), UserManager.isHeadlessSystemUserMode()
? eq(UserHandle.getUserId(UID_HEADLESS))
: eq(USER_SYSTEM));
}
@Test
@@ -6870,7 +6881,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test
public void testClearInlineReplyUriPermission_uriRecordExists() throws Exception {
NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, 0);
int userId = UserManager.isHeadlessSystemUserMode()
? UserHandle.getUserId(UID_HEADLESS)
: USER_SYSTEM;
NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, userId);
reset(mPackageManager);
Uri uri1 = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, 1);
@@ -6932,7 +6947,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
// permissionOwner destroyed for USER_SYSTEM, not USER_ALL
verify(mUgmInternal, times(1)).revokeUriPermissionFromOwner(
eq(record.getPermissionOwner()), eq(null), eq(~0), eq(USER_SYSTEM));
eq(record.getPermissionOwner()), eq(null), eq(~0),
UserManager.isHeadlessSystemUserMode()
? eq(UserHandle.getUserId(UID_HEADLESS))
: eq(USER_SYSTEM));
}
@Test
@@ -7425,6 +7443,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test
public void createConversationNotificationChannel() throws Exception {
int userId = UserManager.isHeadlessSystemUserMode()
? UserHandle.getUserId(UID_HEADLESS)
: USER_SYSTEM;
NotificationChannel original = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
original.setAllowBubbles(!original.canBubble());
original.setShowBadge(!original.canShowBadge());
@@ -7443,7 +7465,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
PKG, mUid, orig, "friend");
NotificationChannel friendChannel = mBinderService.getConversationNotificationChannel(
PKG, 0, PKG, original.getId(), false, "friend");
PKG, userId, PKG, original.getId(), false, "friend");
assertEquals(original.getName(), friendChannel.getName());
assertEquals(original.getId(), friendChannel.getParentChannelId());