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

Commit 0e9afe60 authored by Erin Yan's avatar Erin Yan Committed by Dan Harms
Browse files

Retrieve unlockProfile attribute with private namespace 

Bug: 167105906
Bug: 155663736
Test: Attribute value is correctly parsed from
packages/apps/Car/CompanionDeviceSupport/res/xml/car_trust_agent.xml
Change-Id: If1d89607718462d8e073dee7c6482bf12c3f84c7
parent 9f77031d

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;