Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Harms
2020-09-03 19:36:28 +00:00
committed by Android (Google) Code Review
parent e7af3e1adb 0e9afe60a3
commit ef43ff3f9d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -123,6 +123,8 @@ public class TrustManagerService extends SystemService {
private static final String TRUST_TIMEOUT_ALARM_TAG = "TrustManagerService.trustTimeoutForUser"; 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 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 ArraySet<AgentInfo> mActiveAgents = new ArraySet<>();
private final ArrayList<ITrustListener> mTrustListeners = new ArrayList<>(); private final ArrayList<ITrustListener> mTrustListeners = new ArrayList<>();
private final Receiver mReceiver = new Receiver(); private final Receiver mReceiver = new Receiver();
@@ -808,8 +810,8 @@ public class TrustManagerService extends SystemService {
TypedArray sa = res TypedArray sa = res
.obtainAttributes(attrs, com.android.internal.R.styleable.TrustAgent); .obtainAttributes(attrs, com.android.internal.R.styleable.TrustAgent);
cn = sa.getString(com.android.internal.R.styleable.TrustAgent_settingsActivity); cn = sa.getString(com.android.internal.R.styleable.TrustAgent_settingsActivity);
canUnlockProfile = sa.getBoolean( canUnlockProfile = attrs.getAttributeBooleanValue(
com.android.internal.R.styleable.TrustAgent_unlockProfile, false); PRIV_NAMESPACE, "unlockProfile", false);
sa.recycle(); sa.recycle();
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
caughtException = e; caughtException = e;