Merge "Hide "Long Background Tasks" page from Settings." into udc-dev
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index d8af009..73241b7 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -193,6 +193,8 @@
android:key="long_background_tasks"
android:title="@string/long_background_tasks_title"
android:summary="@string/summary_placeholder"
+ settings:isPreferenceVisible="false"
+ settings:searchable="false"
settings:controller="com.android.settings.applications.appinfo.LongBackgroundTasksDetailsPreferenceController" />
</PreferenceCategory>
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 2fb4af4..b3f3f7d 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -128,6 +128,8 @@
android:title="@string/long_background_tasks_title"
android:order="-800"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+ settings:isPreferenceVisible="false"
+ settings:searchable="false"
settings:keywords="@string/keywords_long_background_tasks"
settings:controller="com.android.settings.applications.specialaccess.applications.LongBackgroundTaskController">
<extra
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 07a737d..80d3947 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -16,10 +16,6 @@
package com.android.settings.applications;
-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;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
@@ -345,7 +341,9 @@
@Override
public boolean isLongBackgroundTaskPermissionToggleSupported() {
- return TextUtils.equals(RUN_USER_INITIATED_JOBS,
- opToPermission(OP_RUN_USER_INITIATED_JOBS));
+ // Since the RUN_USER_INITIATED_JOBS permission related to this controller is a normal
+ // app-op permission allowed by default, this should always return false - if it is ever
+ // converted to a special app-op permission, this should be updated.
+ return false;
}
}
diff --git a/src/com/android/settings/applications/specialaccess/applications/LongBackgroundTaskController.java b/src/com/android/settings/applications/specialaccess/applications/LongBackgroundTaskController.java
index 586980c..ccfa9c8 100644
--- a/src/com/android/settings/applications/specialaccess/applications/LongBackgroundTaskController.java
+++ b/src/com/android/settings/applications/specialaccess/applications/LongBackgroundTaskController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022 The Android Open Source Project
+ * Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,6 +37,6 @@
@Override
public int getAvailabilityStatus() {
return mAppFeatureProvider.isLongBackgroundTaskPermissionToggleSupported()
- ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
}