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

Commit 8e2c345f authored by Guojing Yuan's avatar Guojing Yuan
Browse files

Catch NetworkPolicy exception when uid is system 

Fix: 264286830

Test: m build
Change-Id: I997f6f131b5d02121c49ae50ceec2d8709fc0f02
parent 5cd7ef0f

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

+14 −10
Original line number Diff line number Diff line
@@ -1160,6 +1160,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)) {
@@ -1171,6 +1172,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);

    }