Merge \"Whitelisting device provisioning package from app standby\" into nyc-mr1-dev (e7ad96f9) · Commits · e / os / android_frameworks_base

services/usage/java/com/android/server/usage/UsageStatsService.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -838,6 +838,10 @@ public class UsageStatsService extends SystemService implements
		&& mAppWidgetManager.isBoundWidgetPackage(packageName, userId)) {
		return false;
		}

		if (isDeviceProvisioningPackage(packageName)) {
		return false;
		}
		}

		if (!isAppIdleUnfiltered(packageName, userId, elapsedRealtime)) {
		@@ -930,6 +934,16 @@ public class UsageStatsService extends SystemService implements
		return dpm.packageHasActiveAdmins(packageName, userId);
		}

		/**
		* Returns {@code true} if the supplied package is the device provisioning app. Otherwise,
		* returns {@code false}.
		*/
		private boolean isDeviceProvisioningPackage(String packageName) {
		String deviceProvisioningPackage = getContext().getResources().getString(
		com.android.internal.R.string.config_deviceProvisioningPackage);
		return deviceProvisioningPackage != null && deviceProvisioningPackage.equals(packageName);
		}

		private boolean isCarrierApp(String packageName) {
		synchronized (mLock) {
		if (!mHaveCarrierPrivilegedApps) {