Merge "Exempt TV devices from Notification Permission"
diff --git a/services/core/java/com/android/server/notification/PermissionHelper.java b/services/core/java/com/android/server/notification/PermissionHelper.java
index b4230c1..a09aa7c 100644
--- a/services/core/java/com/android/server/notification/PermissionHelper.java
+++ b/services/core/java/com/android/server/notification/PermissionHelper.java
@@ -55,8 +55,10 @@
private final PermissionManagerServiceInternal mPmi;
private final IPackageManager mPackageManager;
private final IPermissionManager mPermManager;
- // TODO (b/194833441): Remove when the migration is enabled
+ // TODO (b/194833441): Remove this boolean (but keep the isMigrationEnabled() method)
+ // when the migration is enabled
private final boolean mMigrationEnabled;
+ private final boolean mIsTv;
private final boolean mForceUserSetOnUpgrade;
public PermissionHelper(PermissionManagerServiceInternal pmi, IPackageManager packageManager,
@@ -67,10 +69,17 @@
mPermManager = permManager;
mMigrationEnabled = migrationEnabled;
mForceUserSetOnUpgrade = forceUserSetOnUpgrade;
+ boolean isTv;
+ try {
+ isTv = mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK, 0);
+ } catch (RemoteException e) {
+ isTv = false;
+ }
+ mIsTv = isTv;
}
public boolean isMigrationEnabled() {
- return mMigrationEnabled;
+ return mMigrationEnabled && !mIsTv;
}
/**
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index a963280..d21eabe 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -296,6 +296,8 @@
.OnRuntimePermissionStateChangedListener>
mRuntimePermissionStateChangedListeners = new ArrayList<>();
+ private final boolean mIsLeanback;
+
@NonNull
private final OnPermissionChangeListeners mOnPermissionChangeListeners;
@@ -379,6 +381,7 @@
mContext = context;
mPackageManagerInt = LocalServices.getService(PackageManagerInternal.class);
mUserManagerInt = LocalServices.getService(UserManagerInternal.class);
+ mIsLeanback = availableFeatures.containsKey(PackageManager.FEATURE_LEANBACK);
mPrivilegedPermissionAllowlistSourcePackageNames.add(PLATFORM_PACKAGE_NAME);
// PackageManager.hasSystemFeature() is not used here because PackageManagerService
@@ -2821,6 +2824,14 @@
}
}
}
+ if (mIsLeanback && NOTIFICATION_PERMISSIONS.contains(permName)) {
+ uidState.grantPermission(bp);
+ if (origPermState == null || !origPermState.isGranted()) {
+ if (uidState.grantPermission(bp)) {
+ wasChanged = true;
+ }
+ }
+ }
} else {
if (origPermState == null) {
// New permission