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

Commit 8dcab7cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow Android Auto to move to trusted." into tm-qpr-dev am: f267c377 

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



Change-Id: I9472e417bc55e8c8a7a57075704dcccc2355bd02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 607d594c f267c377

services/core/java/com/android/server/trust/TrustManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -602,9 +602,12 @@ public class TrustManagerService extends SystemService { 
        synchronized (mUserTrustState) {

            wasTrusted = (mUserTrustState.get(userId) == TrustState.TRUSTED);

            wasTrustable = (mUserTrustState.get(userId) == TrustState.TRUSTABLE);

            boolean isAutomotive = getContext().getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_AUTOMOTIVE);

            boolean renewingTrust = wasTrustable && (

                    (flags & TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0);

            boolean canMoveToTrusted = alreadyUnlocked || isFromUnlock || renewingTrust;

            boolean canMoveToTrusted =

                    alreadyUnlocked || isFromUnlock || renewingTrust || isAutomotive;

            boolean upgradingTrustForCurrentUser = (userId == mCurrentUser);



            if (trustedByAtLeastOneAgent && wasTrusted) {