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

Commit ad57513b authored by Zhen Zhang's avatar Zhen Zhang Committed by Automerger Merge Worker
Browse files

Merge "Clear calling identity before calling into AMS" into sc-dev am: 54df7500 

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

Change-Id: Ica7743062c42405bffae63b4b7c2404fc31e3658
parents cd00a8a9 54df7500

services/core/java/com/android/server/apphibernation/AppHibernationService.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -393,6 +393,7 @@ public final class AppHibernationService extends SystemService { 
        Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "unhibernatePackage");

        Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "unhibernatePackage");

        pkgState.hibernated = false;

        pkgState.hibernated = false;

        pkgState.lastUnhibernatedMs = System.currentTimeMillis();

        pkgState.lastUnhibernatedMs = System.currentTimeMillis();

        final long caller = Binder.clearCallingIdentity();

        // Deliver LOCKED_BOOT_COMPLETE AND BOOT_COMPLETE broadcast so app can re-register

        // Deliver LOCKED_BOOT_COMPLETE AND BOOT_COMPLETE broadcast so app can re-register

        // their alarms/jobs/etc.

        // their alarms/jobs/etc.

        try {

        try {
@@ -435,9 +436,11 @@ public final class AppHibernationService extends SystemService { 
                    userId);

                    userId);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        } finally {

            Binder.restoreCallingIdentity(caller);

            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

        }

        }

    }





    /**

    /**

     * Put a package into global hibernation, optimizing its storage at a package / APK level.

     * Put a package into global hibernation, optimizing its storage at a package / APK level.