From 4109caa5330cd013e9f5e35388f3588d43faa96f Mon Sep 17 00:00:00 2001 From: Varun Shah Date: Wed, 8 Feb 2023 17:41:22 +0000 Subject: [PATCH] Update references to the RUN_LONG_JOBS permission. The permission has been renamed to RUN_USER_INITIATED_JOBS. Bug: 255038128 Test: build/manual Change-Id: Ia32a6d564d62b2c0318c7afbd6de0ad9644e52d0 --- src/com/android/settings/Settings.java | 2 +- .../AppStateLongBackgroundTasksBridge.java | 14 +++++++------- .../ApplicationFeatureProviderImpl.java | 7 ++++--- .../appinfo/LongBackgroundTasksDetails.java | 10 +++++----- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index f037a05ac14..22160d75741 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -437,7 +437,7 @@ public class Settings extends SettingsActivity { } } - /** Actviity to manage apps with {@link android.Manifest.permission#RUN_LONG_JOBS} */ + /** Actviity to manage apps with {@link android.Manifest.permission#RUN_USER_INITIATED_JOBS} */ public static class LongBackgroundTasksActivity extends SettingsActivity { /* empty */ } /** App specific version of {@link LongBackgroundTasksActivity} */ public static class LongBackgroundTasksAppActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/applications/AppStateLongBackgroundTasksBridge.java b/src/com/android/settings/applications/AppStateLongBackgroundTasksBridge.java index d286c5e4347..28fe6d66d54 100644 --- a/src/com/android/settings/applications/AppStateLongBackgroundTasksBridge.java +++ b/src/com/android/settings/applications/AppStateLongBackgroundTasksBridge.java @@ -37,11 +37,11 @@ import java.util.List; /** * Connects app op info to the ApplicationsState. Extends {@link AppStateAppOpsBridge} to tailor - * to the semantics of {@link Manifest.permission#RUN_LONG_JOBS}. + * to the semantics of {@link Manifest.permission#RUN_USER_INITIATED_JOBS}. * Also provides app filters that can use the info. */ public class AppStateLongBackgroundTasksBridge extends AppStateBaseBridge { - private static final String PERMISSION = Manifest.permission.RUN_LONG_JOBS; + private static final String PERMISSION = Manifest.permission.RUN_USER_INITIATED_JOBS; private static final String TAG = "LongBackgroundTasksBridge"; @VisibleForTesting @@ -64,15 +64,15 @@ public class AppStateLongBackgroundTasksBridge extends AppStateBaseBridge { } /** - * Returns information regarding {@link Manifest.permission#RUN_LONG_JOBS} for the given - * package and uid. + * Returns information regarding {@link Manifest.permission#RUN_USER_INITIATED_JOBS} for the + * given package and uid. */ public LongBackgroundTasksState createPermissionState(String packageName, int uid) { final int userId = UserHandle.getUserId(uid); final boolean permissionRequested = ArrayUtils.contains(mRequesterPackages, packageName); - final boolean permissionGranted = mJobScheduler.hasRunLongJobsPermission(packageName, - userId); + final boolean permissionGranted = mJobScheduler.hasRunUserInitiatedJobsPermission( + packageName, userId); return new LongBackgroundTasksState(permissionRequested, permissionGranted); } @@ -108,7 +108,7 @@ public class AppStateLongBackgroundTasksBridge extends AppStateBaseBridge { /** * Class to denote the state of an app regarding - * {@link Manifest.permission#RUN_LONG_JOBS}. + * {@link Manifest.permission#RUN_USER_INITIATED_JOBS}. */ public static class LongBackgroundTasksState { private boolean mPermissionRequested; diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java index f2a3d6a30c3..07a737dfa42 100644 --- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java +++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java @@ -16,8 +16,8 @@ package com.android.settings.applications; -import static android.Manifest.permission.RUN_LONG_JOBS; -import static android.app.AppOpsManager.OP_RUN_LONG_JOBS; +import static android.Manifest.permission.RUN_USER_INITIATED_JOBS; +import static android.app.AppOpsManager.OP_RUN_USER_INITIATED_JOBS; import static android.app.AppOpsManager.opToPermission; import android.Manifest; @@ -345,6 +345,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide @Override public boolean isLongBackgroundTaskPermissionToggleSupported() { - return TextUtils.equals(RUN_LONG_JOBS, opToPermission(OP_RUN_LONG_JOBS)); + return TextUtils.equals(RUN_USER_INITIATED_JOBS, + opToPermission(OP_RUN_USER_INITIATED_JOBS)); } } diff --git a/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java b/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java index 1e5d11a6b9d..5ee4c825da7 100644 --- a/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java +++ b/src/com/android/settings/applications/appinfo/LongBackgroundTasksDetails.java @@ -36,7 +36,7 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry; /** * App specific activity to show details about - * {@link android.Manifest.permission#RUN_LONG_JOBS}. + * {@link android.Manifest.permission#RUN_USER_INITIATED_JOBS}. */ public class LongBackgroundTasksDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { @@ -52,7 +52,7 @@ public class LongBackgroundTasksDetails extends AppInfoWithHeader /** * Returns the string that states whether the app has access to - * {@link android.Manifest.permission#RUN_LONG_JOBS}. + * {@link android.Manifest.permission#RUN_USER_INITIATED_JOBS}. */ public static CharSequence getSummary(Context context, AppEntry entry) { final AppStateLongBackgroundTasksBridge.LongBackgroundTasksState state = @@ -104,9 +104,9 @@ public class LongBackgroundTasksDetails extends AppInfoWithHeader return false; } - private void setCanRunLongJobs(boolean newState) { + private void setCanRunUserInitiatedJobs(boolean newState) { final int uid = mPackageInfo.applicationInfo.uid; - mAppOpsManager.setUidMode(AppOpsManager.OPSTR_RUN_LONG_JOBS, uid, + mAppOpsManager.setUidMode(AppOpsManager.OPSTR_RUN_USER_INITIATED_JOBS, uid, newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED); } @@ -132,7 +132,7 @@ public class LongBackgroundTasksDetails extends AppInfoWithHeader } if (mPermissionState != null && mUncommittedState != null && mUncommittedState != mPermissionState.isAllowed()) { - setCanRunLongJobs(mUncommittedState); + setCanRunUserInitiatedJobs(mUncommittedState); logPermissionChange(mUncommittedState, mPackageName); mUncommittedState = null; }