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

Commit 285e3754 authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f am: 38762c75 am: af1f784e 

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

Change-Id: I0155ccab9da75bf5b5f34825a21003545219b512
parents 8215d0e1 af1f784e

services/core/java/com/android/server/locksettings/RebootEscrowManager.java

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.UserIdInt;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.os.Handler;

import android.os.SystemClock;
@@ -224,6 +225,12 @@ class RebootEscrowManager { 
        }



        public boolean serverBasedResumeOnReboot() {

            // Always use the server based RoR if the HAL isn't installed on device.

            if (!mContext.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_REBOOT_ESCROW)) {

                return true;

            }



            return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_OTA,

                    "server_based_ror_enabled", false);

        }
@@ -374,6 +381,7 @@ class RebootEscrowManager { 
        try {

            escrowKey = getAndClearRebootEscrowKey(kk);

        } catch (IOException e) {

            Slog.i(TAG, "Failed to load escrow key, scheduling retry.", e);

            scheduleLoadRebootEscrowDataOrFail(retryHandler, attemptNumber + 1, users,

                    rebootEscrowUsers);

            return;