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

Merge "Clear calling identity before calling to DeviceIdleController"

Browse Source
This commit is contained in:
Chiachang Wang
2023-04-13 06:06:50 +00:00
committed by Gerrit Code Review
parent d1d75b1a9d 4e9fced556
commit 6216ab81c1
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -969,15 +969,21 @@ public class Vpn {
// Allow VpnManager app to temporarily run background services to handle this error. // Allow VpnManager app to temporarily run background services to handle this error.
// If an app requires anything beyond this grace period, they MUST either declare // If an app requires anything beyond this grace period, they MUST either declare
// themselves as a foreground service, or schedule a job/workitem. // themselves as a foreground service, or schedule a job/workitem.
DeviceIdleInternal idleController = mDeps.getDeviceIdleInternal(); final long token = Binder.clearCallingIdentity();
idleController.addPowerSaveTempWhitelistApp(Process.myUid(), packageName,
VPN_MANAGER_EVENT_ALLOWLIST_DURATION_MS, mUserId, false, REASON_VPN,
"VpnManager event");
try { try {
return mUserIdContext.startService(intent) != null; final DeviceIdleInternal idleController = mDeps.getDeviceIdleInternal();
} catch (RuntimeException e) { idleController.addPowerSaveTempWhitelistApp(Process.myUid(), packageName,
Log.e(TAG, "Service of VpnManager app " + intent + " failed to start", e); VPN_MANAGER_EVENT_ALLOWLIST_DURATION_MS, mUserId, false, REASON_VPN,
return false; "VpnManager event");
try {
return mUserIdContext.startService(intent) != null;
} catch (RuntimeException e) {
Log.e(TAG, "Service of VpnManager app " + intent + " failed to start", e);
return false;
}
} finally {
Binder.restoreCallingIdentity(token);
} }
} }