Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear calling identity before calling into AMS

Browse Source 
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
This commit is contained in:
Zhen Zhang
2021-04-29 15:50:25 -07:00
parent 41a4d6741e
commit 9ac468fc35
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/apphibernation/AppHibernationService.java
View File

@@ -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,8 +436,10 @@ public final class AppHibernationService extends SystemService {
userId);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} finally {
Binder.restoreCallingIdentity(caller);
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
/**