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

Commit 4d9420f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Let UserController mock OTAs"

parents 86beb918 5a66a030

services/core/java/com/android/server/am/UserController.java

+3 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import android.os.RemoteCallbackList; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManagerInternal;
@@ -550,7 +551,8 @@ class UserController implements Handler.Callback { 
        // purposefully block sending BOOT_COMPLETED until after all

        // PRE_BOOT receivers are finished to avoid ANR'ing apps

        final UserInfo info = getUserInfo(userId);

        if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)) {

        if (!Objects.equals(info.lastLoggedInFingerprint, Build.FINGERPRINT)

                || SystemProperties.getBoolean("persist.pm.mock-upgrade", false)) {

            // Suppress double notifications for managed profiles that

            // were unlocked automatically as part of their parent user

            // being unlocked.