diff options
| -rw-r--r-- | services/core/java/com/android/server/notification/PermissionHelper.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/notification/PermissionHelper.java b/services/core/java/com/android/server/notification/PermissionHelper.java index a09aa7cea0a4..b4230c11bcab 100644 --- a/services/core/java/com/android/server/notification/PermissionHelper.java +++ b/services/core/java/com/android/server/notification/PermissionHelper.java @@ -55,10 +55,8 @@ public final class PermissionHelper { private final PermissionManagerServiceInternal mPmi; private final IPackageManager mPackageManager; private final IPermissionManager mPermManager; - // TODO (b/194833441): Remove this boolean (but keep the isMigrationEnabled() method) - // when the migration is enabled + // TODO (b/194833441): Remove when the migration is enabled private final boolean mMigrationEnabled; - private final boolean mIsTv; private final boolean mForceUserSetOnUpgrade; public PermissionHelper(PermissionManagerServiceInternal pmi, IPackageManager packageManager, @@ -69,17 +67,10 @@ public final class PermissionHelper { 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 && !mIsTv; + return mMigrationEnabled; } /** |