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

Merge "Fully migrate tv to notification permission" into tm-dev am: 3c59d6c155 am: 9f46c9e343 am: 488a9478a1

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

Change-Id: Ia211f5a8e2c66f63eb723e053c7d086244d9dc94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-06 15:58:45 +00:00
committed by Automerger Merge Worker
parent 8f492ef14e 488a9478a1
commit 485df62515
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/notification/PermissionHelper.java
View File

@@ -55,10 +55,8 @@ public final class PermissionHelper {
private final PermissionManagerServiceInternal mPmi; private final PermissionManagerServiceInternal mPmi;
private final IPackageManager mPackageManager; private final IPackageManager mPackageManager;
private final IPermissionManager mPermManager; private final IPermissionManager mPermManager;
// TODO (b/194833441): Remove this boolean (but keep the isMigrationEnabled() method) // TODO (b/194833441): Remove when the migration is enabled
// when the migration is enabled
private final boolean mMigrationEnabled; private final boolean mMigrationEnabled;
private final boolean mIsTv;
private final boolean mForceUserSetOnUpgrade; private final boolean mForceUserSetOnUpgrade;
public PermissionHelper(PermissionManagerServiceInternal pmi, IPackageManager packageManager, public PermissionHelper(PermissionManagerServiceInternal pmi, IPackageManager packageManager,
@@ -69,17 +67,10 @@ public final class PermissionHelper {
mPermManager = permManager; mPermManager = permManager;
mMigrationEnabled = migrationEnabled; mMigrationEnabled = migrationEnabled;
mForceUserSetOnUpgrade = forceUserSetOnUpgrade; mForceUserSetOnUpgrade = forceUserSetOnUpgrade;
boolean isTv;
try {
isTv = mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK, 0);
} catch (RemoteException e) {
isTv = false;
}
mIsTv = isTv;
} }
public boolean isMigrationEnabled() { public boolean isMigrationEnabled() {
return mMigrationEnabled && !mIsTv; return mMigrationEnabled;
} }
/** /**