Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485df625 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fully migrate tv to notification permission" into tm-dev am: 3c59d6c1... 

Merge "Fully migrate tv to notification permission" into tm-dev am: 3c59d6c1 am: 9f46c9e3 am: 488a9478

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



Change-Id: Ia211f5a8e2c66f63eb723e053c7d086244d9dc94
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f492ef1 488a9478

services/core/java/com/android/server/notification/PermissionHelper.java

+2 −11
Original line number Diff line number Diff line
@@ -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;

    }



    /**