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

Commit 72996f06 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 QPR1 

Bug: 210511427
Merged-In: Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7
Change-Id: I43f94bca1c8db649bec91e0de1bd41c89ba8f1f7
parents 14c8d5f0 655d7f98

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+11 −0
Original line number Diff line number Diff line
@@ -2918,6 +2918,13 @@ public class DeviceIdleController extends SystemService 
                            reasonCode, reason).sendToTarget();

                }

                reportTempWhitelistChangedLocked(uid, true);

            } else {

                // The uid is already temp allowlisted, only need to update AMS for temp allowlist

                // duration.

                if (mLocalActivityManager != null) {

                    mLocalActivityManager.updateDeviceIdleTempAllowlist(null, uid, true,

                            duration, tempAllowListType, reasonCode, reason, callingUid);

                }

            }

        }

        if (informWhitelistChanged) {
@@ -3941,6 +3948,10 @@ public class DeviceIdleController extends SystemService 
        if (idleUntil) {

            mAlarmManager.setIdleUntil(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                    mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);

        } else if (mState == STATE_LOCATING) {

            // Use setExact so we don't keep the GPS active for too long.

            mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                    mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);

        } else {

            if (mConstants.USE_WINDOW_ALARMS) {

                mAlarmManager.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP,

cmds/bootanimation/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ cc_library_shared { 
        "libui",

        "libjnigraphics",

        "libEGL",

        "libGLESv1_CM",

        "libGLESv2",

        "libgui",

    ],

}