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

Commit e42c0013 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Clear calling identity before calling to DeviceIdleController" am:... 

Merge "Clear calling identity before calling to DeviceIdleController" am: 6216ab81 am: bc0f38ed am: e233c0dc am: 502a2731

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



Change-Id: I4458926b7ea7060572812bdaac1e293211e6a9ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0027117b 502a2731

services/core/java/com/android/server/connectivity/Vpn.java

+14 −8
Original line number Original line Diff line number Diff line
@@ -969,16 +969,22 @@ 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();

        try {

            final DeviceIdleInternal idleController = mDeps.getDeviceIdleInternal();

            idleController.addPowerSaveTempWhitelistApp(Process.myUid(), packageName,

            idleController.addPowerSaveTempWhitelistApp(Process.myUid(), packageName,

                    VPN_MANAGER_EVENT_ALLOWLIST_DURATION_MS, mUserId, false, REASON_VPN,

                    VPN_MANAGER_EVENT_ALLOWLIST_DURATION_MS, mUserId, false, REASON_VPN,

                    "VpnManager event");

                    "VpnManager event");



            try {

            try {

                return mUserIdContext.startService(intent) != null;

                return mUserIdContext.startService(intent) != null;

            } catch (RuntimeException e) {

            } catch (RuntimeException e) {

                Log.e(TAG, "Service of VpnManager app " + intent + " failed to start", e);

                Log.e(TAG, "Service of VpnManager app " + intent + " failed to start", e);

                return false;

                return false;

            }

            }

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }

    }





    private static boolean isVpnApp(String packageName) {

    private static boolean isVpnApp(String packageName) {