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

Merge "Stop lock on GMSCore crashloop" into udc-dev

Browse Source
This commit is contained in:
Jacob Hobbie
2023-04-28 22:45:02 +00:00
committed by Android (Google) Code Review
parent 18a30d586d 35a976ff7a
commit 49faea5924
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,13 @@ public class TrustAgentWrapper {
mDisplayTrustGrantedMessage = (flags & FLAG_GRANT_TRUST_DISPLAY_MESSAGE) != 0;
if ((flags & FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0) {
mWaitingForTrustableDowngrade = true;
setSecurityWindowTimer();
resultCallback.thenAccept(result -> {
if (result.getStatus() == GrantTrustResult.STATUS_UNLOCKED_BY_GRANT) {
// if we are not unlocked by grantTrust, then we don't need to
// have the timer for the security window
setSecurityWindowTimer();
}
});
} else {
mWaitingForTrustableDowngrade = false;
}
@@ -562,6 +568,7 @@ public class TrustAgentWrapper {
* @see android.service.trust.TrustAgentService#onDeviceLocked()
*/
public void onDeviceLocked() {
mWithinSecurityLockdownWindow = false;
try {
if (mTrustAgentService != null) mTrustAgentService.onDeviceLocked();
} catch (RemoteException e) {