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

Commit 84e69e47 authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Exempt VPN apps from BG-FGS-launch restriction." into sc-dev am: 8d599ec0 

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

Change-Id: Idb3072e46fcdbe2a3bafcce061ba409a4107a834
parents a09185a5 8d599ec0

apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java

+10 −0
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ public class PowerExemptionManager { 
    public static final int REASON_APPOP = 66;

    /** @hide */

    public static final int REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD = 67;

    /** @hide */

    public static final int REASON_OP_ACTIVATE_VPN = 68;

    /** @hide */

    public static final int REASON_OP_ACTIVATE_PLATFORM_VPN = 69;



    /* BG-FGS-launch is allowed by temp-allow-list or system-allow-list.

       Reason code for temp and system allow list starts here.
@@ -344,6 +348,8 @@ public class PowerExemptionManager { 
            REASON_ALLOWLISTED_PACKAGE,

            REASON_APPOP,

            REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD,

            REASON_OP_ACTIVATE_VPN,

            REASON_OP_ACTIVATE_PLATFORM_VPN,

            // temp and system allow list reasons.

            REASON_GEOFENCING,

            REASON_PUSH_MESSAGING,
@@ -603,6 +609,10 @@ public class PowerExemptionManager { 
                return "APPOP";

            case REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD:

                return "ACTIVITY_VISIBILITY_GRACE_PERIOD";

            case REASON_OP_ACTIVATE_VPN:

                return "OP_ACTIVATE_VPN";

            case REASON_OP_ACTIVATE_PLATFORM_VPN:

                return "OP_ACTIVATE_PLATFORM_VPN";

            case REASON_GEOFENCING:

                return "GEOFENCING";

            case REASON_PUSH_MESSAGING:

services/core/java/com/android/server/am/ActiveServices.java

+13 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import static android.app.ActivityManager.PROCESS_STATE_TOP; 
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST;

import static android.os.PowerExemptionManager.REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD;

import static android.os.PowerExemptionManager.REASON_OP_ACTIVATE_PLATFORM_VPN;

import static android.os.PowerExemptionManager.REASON_OP_ACTIVATE_VPN;

import static android.os.PowerWhitelistManager.REASON_ACTIVITY_STARTER;

import static android.os.PowerWhitelistManager.REASON_ALLOWLISTED_PACKAGE;

import static android.os.PowerWhitelistManager.REASON_BACKGROUND_ACTIVITY_PERMISSION;
@@ -5865,6 +5867,17 @@ public final class ActiveServices { 
            }

        }



        if (ret == REASON_DENIED) {

            final AppOpsManager appOpsManager = mAm.getAppOpsManager();

            if (appOpsManager.checkOpNoThrow(AppOpsManager.OP_ACTIVATE_VPN, callingUid,

                    callingPackage) == AppOpsManager.MODE_ALLOWED) {

                ret = REASON_OP_ACTIVATE_VPN;

            } else if (appOpsManager.checkOpNoThrow(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN,

                    callingUid, callingPackage) == AppOpsManager.MODE_ALLOWED) {

                ret = REASON_OP_ACTIVATE_PLATFORM_VPN;

            }

        }



        return ret;

    }