Don't check for carrier privileged apps.

if the device doesn't support Telephony APIs for the subscriptions

Bug: 394635545
Flag: EXEMPT bug fix
Test: atest FrameworksServicesTests:com.android.server.usage.AppStandbyControllerTests#testSlicePinnedEvent
      on non-telephony supported devices.
Change-Id: I7b28a6983207fe1a67243c3046e72e1517ff5beb

1 files changed, 5 insertions, 1 deletions

diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
index 9871d713178e..ab8131ba5126 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -264,6 +264,8 @@ public class AppStandbyController
     @GuardedBy("mCarrierPrivilegedLock")
     private boolean mHaveCarrierPrivilegedApps;
 
+    private final boolean mHasFeatureTelephonySubscription;
+
     /** List of carrier-privileged apps that should be excluded from standby */
     @GuardedBy("mCarrierPrivilegedLock")
     private List<String> mCarrierPrivilegedApps;
@@ -603,6 +605,8 @@ public class AppStandbyController
         mContext = mInjector.getContext();
         mHandler = new AppStandbyHandler(mInjector.getLooper());
         mPackageManager = mContext.getPackageManager();
+        mHasFeatureTelephonySubscription = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION);
 
         DeviceStateReceiver deviceStateReceiver = new DeviceStateReceiver();
         IntentFilter deviceStates = new IntentFilter(BatteryManager.ACTION_CHARGING);
@@ -1515,7 +1519,7 @@ public class AppStandbyController
         }
 
         // Check this last, as it can be the most expensive check
-        if (isCarrierApp(packageName)) {
+        if (mHasFeatureTelephonySubscription && isCarrierApp(packageName)) {
             return STANDBY_BUCKET_EXEMPTED;
         }