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

Merge "Fixing an Active Unlock security vulnerability." into tm-qpr-dev

Browse Source
This commit is contained in:
Jacob Hobbie
2022-11-29 17:08:04 +00:00
committed by Android (Google) Code Review
parent 16712430df 48ee13b659
commit 738f874e44
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/trust/TrustAgentWrapper.java
View File

@@ -107,6 +107,7 @@ public class TrustAgentWrapper {
// Trust state // Trust state
private boolean mTrusted; private boolean mTrusted;
private boolean mWaitingForTrustableDowngrade = false; private boolean mWaitingForTrustableDowngrade = false;
private boolean mWithinSecurityLockdownWindow = false;
private boolean mTrustable; private boolean mTrustable;
private CharSequence mMessage; private CharSequence mMessage;
private boolean mDisplayTrustGrantedMessage; private boolean mDisplayTrustGrantedMessage;
@@ -160,6 +161,7 @@ public class TrustAgentWrapper {
mDisplayTrustGrantedMessage = (flags & FLAG_GRANT_TRUST_DISPLAY_MESSAGE) != 0; mDisplayTrustGrantedMessage = (flags & FLAG_GRANT_TRUST_DISPLAY_MESSAGE) != 0;
if ((flags & FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0) { if ((flags & FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0) {
mWaitingForTrustableDowngrade = true; mWaitingForTrustableDowngrade = true;
setSecurityWindowTimer();
} else { } else {
mWaitingForTrustableDowngrade = false; mWaitingForTrustableDowngrade = false;
} }
@@ -452,6 +454,9 @@ public class TrustAgentWrapper {
if (mBound) { if (mBound) {
scheduleRestart(); scheduleRestart();
} }
if (mWithinSecurityLockdownWindow) {
mTrustManagerService.lockUser(mUserId);
}
// mTrustDisabledByDpm maintains state // mTrustDisabledByDpm maintains state
} }
}; };
@@ -673,6 +678,22 @@ public class TrustAgentWrapper {
} }
} }
private void setSecurityWindowTimer() {
mWithinSecurityLockdownWindow = true;
long expiration = SystemClock.elapsedRealtime() + (15 * 1000); // timer for 15 seconds
mAlarmManager.setExact(
AlarmManager.ELAPSED_REALTIME_WAKEUP,
expiration,
TAG,
new AlarmManager.OnAlarmListener() {
@Override
public void onAlarm() {
mWithinSecurityLockdownWindow = false;
}
},
Handler.getMain());
}
public boolean isManagingTrust() { public boolean isManagingTrust() {
return mManagingTrust && !mTrustDisabledByDpm; return mManagingTrust && !mTrustDisabledByDpm;
} }
@@ -691,7 +712,6 @@ public class TrustAgentWrapper {
public void destroy() { public void destroy() {
mHandler.removeMessages(MSG_RESTART_TIMEOUT); mHandler.removeMessages(MSG_RESTART_TIMEOUT);
if (!mBound) { if (!mBound) {
return; return;
} }