Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow deviceProvisioningPackage to start foreground service from the background." into udc-dev

Browse Source
This commit is contained in:
Hui Yu
2023-06-16 20:01:27 +00:00
committed by Android (Google) Code Review
parent 9bc348cf8b cefa3d7700
commit f338ffa8f7
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -406,6 +406,8 @@ public final class ActiveServices {
// allowlisted packageName. // allowlisted packageName.
ArraySet<String> mAllowListWhileInUsePermissionInFgs = new ArraySet<>(); ArraySet<String> mAllowListWhileInUsePermissionInFgs = new ArraySet<>();
String mCachedDeviceProvisioningPackage;
// TODO: remove this after feature development is done // TODO: remove this after feature development is done
private static final SimpleDateFormat DATE_FORMATTER = private static final SimpleDateFormat DATE_FORMATTER =
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -480,7 +482,8 @@ public final class ActiveServices {
// (REASON_ALARM_MANAGER_ALARM_CLOCK), allow it to continue and do not stop it, // (REASON_ALARM_MANAGER_ALARM_CLOCK), allow it to continue and do not stop it,
// even the app is background-restricted. // even the app is background-restricted.
if (r.isForeground if (r.isForeground
&& r.mAllowStartForegroundAtEntering != REASON_ALARM_MANAGER_ALARM_CLOCK) { && r.mAllowStartForegroundAtEntering != REASON_ALARM_MANAGER_ALARM_CLOCK
&& !isDeviceProvisioningPackage(r.packageName)) {
toStop.add(r); toStop.add(r);
} }
} }
@@ -880,7 +883,8 @@ public final class ActiveServices {
boolean forcedStandby = false; boolean forcedStandby = false;
if (bgLaunch if (bgLaunch
&& appRestrictedAnyInBackground(appUid, appPackageName) && appRestrictedAnyInBackground(appUid, appPackageName)
&& !isTempAllowedByAlarmClock(appUid)) { && !isTempAllowedByAlarmClock(appUid)
&& !isDeviceProvisioningPackage(appPackageName)) {
if (DEBUG_FOREGROUND_SERVICE) { if (DEBUG_FOREGROUND_SERVICE) {
Slog.d(TAG, "Forcing bg-only service start only for " + r.shortInstanceName Slog.d(TAG, "Forcing bg-only service start only for " + r.shortInstanceName
+ " : bgLaunch=" + bgLaunch + " callerFg=" + callerFg); + " : bgLaunch=" + bgLaunch + " callerFg=" + callerFg);
@@ -1926,6 +1930,9 @@ public final class ActiveServices {
*/ */
private boolean isForegroundServiceAllowedInBackgroundRestricted(ProcessRecord app) { private boolean isForegroundServiceAllowedInBackgroundRestricted(ProcessRecord app) {
final ProcessStateRecord state = app.mState; final ProcessStateRecord state = app.mState;
if (isDeviceProvisioningPackage(app.info.packageName)) {
return true;
}
if (!state.isBackgroundRestricted() if (!state.isBackgroundRestricted()
|| state.getSetProcState() <= ActivityManager.PROCESS_STATE_BOUND_TOP) { || state.getSetProcState() <= ActivityManager.PROCESS_STATE_BOUND_TOP) {
return true; return true;
@@ -8404,4 +8411,13 @@ public final class ActiveServices {
} }
return results; return results;
} }
private boolean isDeviceProvisioningPackage(String packageName) {
if (mCachedDeviceProvisioningPackage == null) {
mCachedDeviceProvisioningPackage = mAm.mContext.getResources().getString(
com.android.internal.R.string.config_deviceProvisioningPackage);
}
return mCachedDeviceProvisioningPackage != null
&& mCachedDeviceProvisioningPackage.equals(packageName);
}
} }