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

Commit ec9f01ac authored by Guojing Yuan's avatar Guojing Yuan Committed by Android (Google) Code Review
Browse files

Merge "Catch NetworkPolicy exception when uid is system"

parents ef258d57 8e2c345f

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+14 −10
Original line number Diff line number Diff line
@@ -1172,6 +1172,7 @@ public class CompanionDeviceManagerService extends SystemService { 
        }



        NetworkPolicyManager networkPolicyManager = NetworkPolicyManager.from(getContext());

        try {

            if (containsEither(packageInfo.requestedPermissions,

                    android.Manifest.permission.USE_DATA_IN_BACKGROUND,

                    android.Manifest.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND)) {
@@ -1183,6 +1184,9 @@ public class CompanionDeviceManagerService extends SystemService { 
                        packageInfo.applicationInfo.uid,

                        NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND);

            }

        } catch (IllegalArgumentException e) {

            Slog.e(TAG, e.getMessage());

        }



        exemptFromAutoRevoke(packageInfo.packageName, packageInfo.applicationInfo.uid);

    }