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

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

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

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

Change-Id: I26691ea7fb95207b5979aedd23b8018411bf4edc
parents 5e1d498f ef43ff3f

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

+4 −2
Original line number Diff line number Diff line
@@ -123,6 +123,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();
@@ -808,8 +810,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;