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

Merge "Clear calling identity before calling into AMS" into sc-dev

Browse Source
This commit is contained in:
Zhen Zhang
2021-04-30 06:53:05 +00:00
committed by Android (Google) Code Review
parent a44256effd 9ac468fc35
commit 54df750079
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"); 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,8 +436,10 @@ 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);
} }
/** /**