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

Commit e0ae5453 authored by Dan Harms's avatar Dan Harms Committed by Automerger Merge Worker
Browse files

Merge "Retrieve unlockProfile attribute with private namespace" into... 

Merge "Retrieve unlockProfile attribute with private namespace" into rvc-qpr-dev am: ef43ff3f am: a886d6de

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

Change-Id: I9a48e2ce0a14e49a0e12036ef89e513676dc7f6f
parents 01d4ef82 a886d6de

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

+4 −2
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ public class TrustManagerService extends SystemService { 
    private static final String TRUST_TIMEOUT_ALARM_TAG = "TrustManagerService.trustTimeoutForUser";

    private static final long TRUST_TIMEOUT_IN_MILLIS = 4 * 60 * 60 * 1000;



    private static final String PRIV_NAMESPACE = "http://schemas.android.com/apk/prv/res/android";



    private final ArraySet<AgentInfo> mActiveAgents = new ArraySet<>();

    private final ArrayList<ITrustListener> mTrustListeners = new ArrayList<>();

    private final Receiver mReceiver = new Receiver();
@@ -811,8 +813,8 @@ public class TrustManagerService extends SystemService { 
            TypedArray sa = res

                    .obtainAttributes(attrs, com.android.internal.R.styleable.TrustAgent);

            cn = sa.getString(com.android.internal.R.styleable.TrustAgent_settingsActivity);

            canUnlockProfile = sa.getBoolean(

                    com.android.internal.R.styleable.TrustAgent_unlockProfile, false);

            canUnlockProfile = attrs.getAttributeBooleanValue(

                    PRIV_NAMESPACE, "unlockProfile", false);

            sa.recycle();

        } catch (PackageManager.NameNotFoundException e) {

            caughtException = e;