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

Match app op permission type to PermissionManager

Browse Source 
Although checkPermissionForDataDelivery is annotated with
PermissionCheckerManager.PermissionResult, we should use ints from
PermissionManager since we are using the PermissionManager API.

Fixes: 269689507
Test: atest NotificationManagerServiceTest
Change-Id: Id05c4cc4b4fbfe19a39fcc0d54e12ec186d95cc5
This commit is contained in:
Lyn
2023-02-15 23:08:46 +00:00
committed by Lyn Han
parent 52a61a8b44
commit 77767ebede
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,6 @@ import android.os.Trace;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.VibrationEffect;
import android.permission.PermissionCheckerManager;
import android.permission.PermissionManager;
import android.provider.DeviceConfig;
import android.provider.Settings;
@@ -6774,7 +6773,7 @@ public class NotificationManagerService extends SystemService {
final int permissionResult = mPermissionManager.checkPermissionForDataDelivery(
Manifest.permission.USE_FULL_SCREEN_INTENT, source, /* message= */ null);
if (permissionResult != PermissionCheckerManager.PERMISSION_GRANTED) {
if (permissionResult != PermissionManager.PERMISSION_GRANTED) {
makeStickyHun(notification);
}

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

@@ -177,7 +177,6 @@ import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserHandle;
import android.os.UserManager;
import android.permission.PermissionCheckerManager;
import android.permission.PermissionManager;
import android.provider.DeviceConfig;
import android.provider.MediaStore;
@@ -10254,7 +10253,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throws Exception {
verifyStickyHun(/* flag= */ SHOW_STICKY_HUN_FOR_DENIED_FSI,
/* permissionState= */ PermissionCheckerManager.PERMISSION_HARD_DENIED,
/* permissionState= */ PermissionManager.PERMISSION_HARD_DENIED,
/* isSticky= */ true);
}
@@ -10263,7 +10262,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throws Exception {
verifyStickyHun(/* flag= */ SHOW_STICKY_HUN_FOR_DENIED_FSI,
/* permissionState= */ PermissionCheckerManager.PERMISSION_SOFT_DENIED,
/* permissionState= */ PermissionManager.PERMISSION_SOFT_DENIED,
/* isSticky= */ true);
}
@@ -10272,7 +10271,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throws Exception {
verifyStickyHun(/* flag= */ SHOW_STICKY_HUN_FOR_DENIED_FSI,
/* permissionState= */ PermissionCheckerManager.PERMISSION_GRANTED,
/* permissionState= */ PermissionManager.PERMISSION_GRANTED,
/* isSticky= */ false);
}
@@ -10281,7 +10280,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throws Exception {
verifyStickyHun(/* flag= */ FSI_FORCE_DEMOTE,
/* permissionState= */ PermissionCheckerManager.PERMISSION_HARD_DENIED,
/* permissionState= */ PermissionManager.PERMISSION_HARD_DENIED,
/* isSticky= */ true);
}
@@ -10290,7 +10289,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throws Exception {
verifyStickyHun(/* flag= */ FSI_FORCE_DEMOTE,
/* permissionState= */ PermissionCheckerManager.PERMISSION_SOFT_DENIED,
/* permissionState= */ PermissionManager.PERMISSION_SOFT_DENIED,
/* isSticky= */ true);
}
@@ -10299,7 +10298,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throws Exception {
verifyStickyHun(/* flag= */ FSI_FORCE_DEMOTE,
/* permissionState= */ PermissionCheckerManager.PERMISSION_GRANTED,
/* permissionState= */ PermissionManager.PERMISSION_GRANTED,
/* isSticky= */ true);
}