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

Commit e982d46a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Synchronise dumpTempWhitelistSchedule in DeviceIdleController.java"... 

Merge "Synchronise dumpTempWhitelistSchedule in DeviceIdleController.java" into main am: 394aaeef am: 720edd3a

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



Change-Id: I5090a5f29709d895095d487efab3d252231d4fbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e033ae9a 720edd3a

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

+7 −3
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ public class DeviceIdleController extends SystemService 
     * List of end times for app-IDs that are temporarily marked as being allowed to access

     * the network and acquire wakelocks. Times are in milliseconds.

     */

    @GuardedBy("this")

    private final SparseArray<Pair<MutableLong, String>> mTempWhitelistAppIdEndTimes

            = new SparseArray<>();
@@ -5010,7 +5011,9 @@ public class DeviceIdleController extends SystemService 
                if (!DumpUtils.checkDumpPermission(getContext(), TAG, pw)) {

                    return -1;

                }

                dumpTempWhitelistSchedule(pw, false);

                synchronized (this) {

                    dumpTempWhitelistScheduleLocked(pw, false);

                }

            }

        } else if ("except-idle-whitelist".equals(cmd)) {

            getContext().enforceCallingOrSelfPermission(
@@ -5294,7 +5297,7 @@ public class DeviceIdleController extends SystemService 
                    pw.println();

                }

            }

            dumpTempWhitelistSchedule(pw, true);

            dumpTempWhitelistScheduleLocked(pw, true);



            size = mTempWhitelistAppIdArray != null ? mTempWhitelistAppIdArray.length : 0;

            if (size > 0) {
@@ -5422,7 +5425,8 @@ public class DeviceIdleController extends SystemService 
        }

    }



    void dumpTempWhitelistSchedule(PrintWriter pw, boolean printTitle) {

    @GuardedBy("this")

    void dumpTempWhitelistScheduleLocked(PrintWriter pw, boolean printTitle) {

        final int size = mTempWhitelistAppIdEndTimes.size();

        if (size > 0) {

            String prefix = "";