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

Commit 1a38e41c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mLocalDeviceIdleController could be null." into sc-dev am: bf25b688 am: e6dedf3d 

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

Change-Id: I019be592c395e37d63db64fe3809557b9ffeff9f
parents e7ebbe1e e6dedf3d

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -14621,7 +14621,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
            String reason, @TempAllowListType int type, int callingUid) {

            String reason, @TempAllowListType int type, int callingUid) {

        synchronized (mProcLock) {

        synchronized (mProcLock) {

            // The temp allowlist type could change according to the reasonCode.

            // The temp allowlist type could change according to the reasonCode.

            if (mLocalDeviceIdleController != null) {

                type = mLocalDeviceIdleController.getTempAllowListType(reasonCode, type);

                type = mLocalDeviceIdleController.getTempAllowListType(reasonCode, type);

            }

            if (type == TEMPORARY_ALLOW_LIST_TYPE_NONE) {

            if (type == TEMPORARY_ALLOW_LIST_TYPE_NONE) {

                return;

                return;

            }

            }