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

Commit 9ac468fc authored by Zhen Zhang's avatar Zhen Zhang
Browse files

Clear calling identity before calling into AMS 

Clear calling identity before calling into AMS in
unhibernatePackageForUser() to make sure we are calling as system user
and avoid security exception

Bug: 186701008
Test: built and flashed to wembley device, then run adb shell cmd
app_hibernation set-state PACKAGE_NAME false. No exceptions found.
Test: atest AppHibernationServiceTest

Change-Id: Icf0c72b85f4c611c84129a6fb9425f4344b4681b
parent 41a4d674

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

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

        pkgState.hibernated = false;

        pkgState.lastUnhibernatedMs = System.currentTimeMillis();

        final long caller = Binder.clearCallingIdentity();

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

        // their alarms/jobs/etc.

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

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        } finally {

            Binder.restoreCallingIdentity(caller);

            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

        }

    }



    /**

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