PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613 am: aa55b9dde7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718

Change-Id: If9b5cd2f1596690131db88606473c271e319d538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-16 18:40:33 +00:00
committed by Automerger Merge Worker
parent 615672aed7 aa55b9dde7
commit 06f11e26a2
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/app_info_settings.xml
View File

@@ -193,6 +193,8 @@
android:key="long_background_tasks" android:key="long_background_tasks"
android:title="@string/long_background_tasks_title" android:title="@string/long_background_tasks_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:isPreferenceVisible="false"
settings:searchable="false"
settings:controller="com.android.settings.applications.appinfo.LongBackgroundTasksDetailsPreferenceController" /> settings:controller="com.android.settings.applications.appinfo.LongBackgroundTasksDetailsPreferenceController" />
</PreferenceCategory> </PreferenceCategory>

2
res/xml/special_access.xml
View File

@@ -128,6 +128,8 @@
android:title="@string/long_background_tasks_title" android:title="@string/long_background_tasks_title"
android:order="-800" android:order="-800"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications" android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
settings:isPreferenceVisible="false"
settings:searchable="false"
settings:keywords="@string/keywords_long_background_tasks" settings:keywords="@string/keywords_long_background_tasks"
settings:controller="com.android.settings.applications.specialaccess.applications.LongBackgroundTaskController"> settings:controller="com.android.settings.applications.specialaccess.applications.LongBackgroundTaskController">
<extra <extra

10
src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
View File

@@ -16,10 +16,6 @@
package com.android.settings.applications; 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.Manifest;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
@@ -345,7 +341,9 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
@Override @Override
public boolean isLongBackgroundTaskPermissionToggleSupported() { public boolean isLongBackgroundTaskPermissionToggleSupported() {
return TextUtils.equals(RUN_USER_INITIATED_JOBS, // Since the RUN_USER_INITIATED_JOBS permission related to this controller is a normal
opToPermission(OP_RUN_USER_INITIATED_JOBS)); // 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;
} }
} }

4
src/com/android/settings/applications/specialaccess/applications/LongBackgroundTaskController.java
View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -37,6 +37,6 @@ public class LongBackgroundTaskController extends BasePreferenceController {
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return mAppFeatureProvider.isLongBackgroundTaskPermissionToggleSupported() return mAppFeatureProvider.isLongBackgroundTaskPermissionToggleSupported()
? AVAILABLE : UNSUPPORTED_ON_DEVICE; ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
} }