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

Merge "Add Media Management Apps activity in Special App Access" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-19 01:00:40 +00:00
committed by Android (Google) Code Review
parent 2a1f61829e d01c81e483
commit 2d932aa5fb
12 changed files with 467 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Settings.java
View File

@@ -217,6 +217,8 @@ public class Settings extends SettingsActivity {
public static class OverlaySettingsActivity extends SettingsActivity { /* empty */ }
public static class ManageExternalStorageActivity extends SettingsActivity { /* empty */ }
public static class AppManageExternalStorageActivity extends SettingsActivity { /* empty */ }
public static class MediaManagementAppsActivity extends SettingsActivity { /* empty */ }
public static class AppMediaManagementAppsActivity extends SettingsActivity { /* empty */ }
public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }
public static class ChangeWifiStateActivity extends SettingsActivity { /* empty */ }
public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }

90
src/com/android/settings/applications/AppStateMediaManagementAppsBridge.java Normal file
View File

@@ -0,0 +1,90 @@
/*
* Copyright (C) 2021 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications;
import android.Manifest;
import android.app.AppOpsManager;
import android.content.Context;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import java.util.List;
/**
* Retrieves information from {@link AppOpsManager} and {@link android.content.pm.PackageManager}
* regarding {@link AppOpsManager#OP_MANAGE_MEDIA} and
* {@link Manifest.permission#MANAGE_MEDIA}.
*/
public class AppStateMediaManagementAppsBridge extends AppStateAppOpsBridge {
private final AppOpsManager mAppOpsManager;
public AppStateMediaManagementAppsBridge(Context context, ApplicationsState appState,
Callback callback) {
super(context, appState, callback,
AppOpsManager.strOpToOp(AppOpsManager.OPSTR_MANAGE_MEDIA),
new String[]{Manifest.permission.MANAGE_MEDIA});
mAppOpsManager = context.getSystemService(AppOpsManager.class);
}
@Override
protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
app.extraInfo = createPermissionState(pkg, uid);
}
@Override
protected void loadAllExtraInfo() {
super.loadAllExtraInfo();
final List<AppEntry> allApps = mAppSession.getAllApps();
final int appCount = allApps.size();
for (int i = 0; i < appCount; i++) {
final AppEntry appEntry = allApps.get(i);
if (appEntry.extraInfo instanceof PermissionState) {
updateExtraInfo(appEntry, appEntry.info.packageName, appEntry.info.uid);
}
}
}
/**
* Returns information regarding {@link Manifest.permission#MANAGE_MEDIA} for the given
* package and uid.
*/
public PermissionState createPermissionState(String packageName, int uid) {
final PermissionState permissionState = getPermissionInfo(packageName, uid);
permissionState.appOpMode = mAppOpsManager.unsafeCheckOpNoThrow(
AppOpsManager.OPSTR_MANAGE_MEDIA, uid, packageName);
return permissionState;
}
/**
* Used by {@link com.android.settings.applications.manageapplications.AppFilterRegistry} to
* determine which apps get to appear on the Special App Access list.
*/
public static final AppFilter FILTER_MEDIA_MANAGEMENT_APPS = new AppFilter() {
@Override
public void init() {
}
@Override
public boolean filterApp(AppEntry info) {
return info.extraInfo != null;
}
};
}

131
src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java Normal file
View File

@@ -0,0 +1,131 @@
/*
* Copyright (C) 2021 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications.appinfo;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateMediaManagementAppsBridge;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
/**
* Class for displaying app info related to {@link AppOpsManager#OP_MANAGE_MEDIA}.
*/
public class MediaManagementAppsDetails extends AppInfoWithHeader implements
OnPreferenceChangeListener {
private static final String KEY_SWITCH_PREF = "media_management_apps_toggle";
private AppStateMediaManagementAppsBridge mAppBridge;
private AppOpsManager mAppOpsManager;
private SwitchPreference mSwitchPref;
private PermissionState mPermissionState;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final Context context = getActivity();
mAppBridge = new AppStateMediaManagementAppsBridge(context, mState, null /* callback */);
mAppOpsManager = context.getSystemService(AppOpsManager.class);
// initialize preferences
addPreferencesFromResource(R.xml.media_management_apps);
mSwitchPref = findPreference(KEY_SWITCH_PREF);
// install event listeners
mSwitchPref.setOnPreferenceChangeListener(this);
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean value = (Boolean) newValue;
if (preference == mSwitchPref) {
if (mPermissionState != null && value != mPermissionState.isPermissible()) {
setCanManageMedia(value);
logPermissionChange(value, mPackageName);
refreshUi();
}
return true;
}
return false;
}
private void setCanManageMedia(boolean newState) {
mAppOpsManager.setUidMode(AppOpsManager.OP_MANAGE_MEDIA, mPackageInfo.applicationInfo.uid,
newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
}
private void logPermissionChange(boolean newState, String packageName) {
mMetricsFeatureProvider.action(
mMetricsFeatureProvider.getAttribution(getActivity()),
SettingsEnums.ACTION_MEDIA_MANAGEMENT_APPS_TOGGLE,
getMetricsCategory(),
packageName,
newState ? 1 : 0);
}
@Override
protected boolean refreshUi() {
if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
return false;
}
mPermissionState = mAppBridge.createPermissionState(mPackageName,
mPackageInfo.applicationInfo.uid);
mSwitchPref.setEnabled(mPermissionState.permissionDeclared);
mSwitchPref.setChecked(mPermissionState.isPermissible());
return true;
}
@Override
protected AlertDialog createDialog(int id, int errorCode) {
return null;
}
@Override
public int getMetricsCategory() {
return SettingsEnums.MEDIA_MANAGEMENT_APPS;
}
/**
* Returns the string that states whether the app has access to
* {@link android.Manifest.permission#MANAGE_MEDIA}.
*/
public static int getSummary(Context context, AppEntry entry) {
final PermissionState state;
if (entry.extraInfo instanceof PermissionState) {
state = (PermissionState) entry.extraInfo;
} else {
state = new AppStateMediaManagementAppsBridge(context, null /* appState */,
null /* callback */).createPermissionState(entry.info.packageName,
entry.info.uid);
}
return state.isPermissible() ? R.string.app_permission_summary_allowed
: R.string.app_permission_summary_not_allowed;
}
}

15
src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
View File

@@ -22,6 +22,7 @@ import com.android.settings.R;
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateManageExternalStorageBridge;
import com.android.settings.applications.AppStateMediaManagementAppsBridge;
import com.android.settings.applications.AppStateNotificationBridge;
import com.android.settings.applications.AppStateOverlayBridge;
import com.android.settings.applications.AppStatePowerBridge;
@@ -52,6 +53,7 @@ public class AppFilterRegistry {
FILTER_APPS_INSTALL_SOURCES,
FILTER_APPS_BLOCKED,
FILTER_ALARMS_AND_REMINDERS,
FILTER_APPS_MEDIA_MANAGEMENT,
})
@interface FilterType {
}
@@ -76,14 +78,15 @@ public class AppFilterRegistry {
public static final int FILTER_APPS_BLOCKED = 16;
public static final int FILTER_MANAGE_EXTERNAL_STORAGE = 17;
public static final int FILTER_ALARMS_AND_REMINDERS = 18;
// Next id: 18. If you add an entry here, length of mFilters should be updated
public static final int FILTER_APPS_MEDIA_MANAGEMENT = 19;
// Next id: 20. If you add an entry here, length of mFilters should be updated
private static AppFilterRegistry sRegistry;
private final AppFilterItem[] mFilters;
private AppFilterRegistry() {
mFilters = new AppFilterItem[19];
mFilters = new AppFilterItem[20];
// High power allowlist, on
mFilters[FILTER_APPS_POWER_ALLOWLIST] = new AppFilterItem(
@@ -194,6 +197,12 @@ public class AppFilterRegistry {
AppStateAlarmsAndRemindersBridge.FILTER_CLOCK_APPS,
FILTER_ALARMS_AND_REMINDERS,
R.string.alarms_and_reminders_title);
// Apps that can manage media files
mFilters[FILTER_APPS_MEDIA_MANAGEMENT] = new AppFilterItem(
AppStateMediaManagementAppsBridge.FILTER_MEDIA_MANAGEMENT_APPS,
FILTER_APPS_MEDIA_MANAGEMENT,
R.string.media_management_apps_title);
}
public static AppFilterRegistry getInstance() {
@@ -224,6 +233,8 @@ public class AppFilterRegistry {
return FILTER_MANAGE_EXTERNAL_STORAGE;
case ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS:
return FILTER_ALARMS_AND_REMINDERS;
case ManageApplications.LIST_TYPE_MEDIA_MANAGEMENT_APPS:
return FILTER_APPS_MEDIA_MANAGEMENT;
default:
return FILTER_APPS_ALL;
}

19
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -96,6 +96,7 @@ import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateManageExternalStorageBridge;
import com.android.settings.applications.AppStateMediaManagementAppsBridge;
import com.android.settings.applications.AppStateNotificationBridge;
import com.android.settings.applications.AppStateNotificationBridge.NotificationsSentState;
import com.android.settings.applications.AppStateOverlayBridge;
@@ -110,6 +111,7 @@ import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.applications.appinfo.DrawOverlayDetails;
import com.android.settings.applications.appinfo.ExternalSourcesDetails;
import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
import com.android.settings.applications.appinfo.MediaManagementAppsDetails;
import com.android.settings.applications.appinfo.WriteSettingsDetails;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.InstrumentedFragment;
@@ -233,6 +235,7 @@ public class ManageApplications extends InstrumentedFragment
public static final int LIST_TYPE_WIFI_ACCESS = 13;
public static final int LIST_MANAGE_EXTERNAL_STORAGE = 14;
public static final int LIST_TYPE_ALARMS_AND_REMINDERS = 15;
public static final int LIST_TYPE_MEDIA_MANAGEMENT_APPS = 16;
// List types that should show instant apps.
public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -324,6 +327,9 @@ public class ManageApplications extends InstrumentedFragment
} else if (className.equals(Settings.ManageExternalStorageActivity.class.getName())) {
mListType = LIST_MANAGE_EXTERNAL_STORAGE;
screenTitle = R.string.manage_external_storage_title;
} else if (className.equals(Settings.MediaManagementAppsActivity.class.getName())) {
mListType = LIST_TYPE_MEDIA_MANAGEMENT_APPS;
screenTitle = R.string.media_management_apps_title;
} else if (className.equals(Settings.AlarmsAndRemindersActivity.class.getName())) {
mListType = LIST_TYPE_ALARMS_AND_REMINDERS;
screenTitle = R.string.alarms_and_reminders_title;
@@ -553,6 +559,8 @@ public class ManageApplications extends InstrumentedFragment
return SettingsEnums.MANAGE_EXTERNAL_STORAGE;
case LIST_TYPE_ALARMS_AND_REMINDERS:
return SettingsEnums.ALARMS_AND_REMINDERS;
case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
return SettingsEnums.MEDIA_MANAGEMENT_APPS;
default:
return SettingsEnums.PAGE_UNKNOWN;
}
@@ -678,6 +686,10 @@ public class ManageApplications extends InstrumentedFragment
startAppInfoFragment(AlarmsAndRemindersDetails.class,
R.string.alarms_and_reminders_label);
break;
case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
startAppInfoFragment(MediaManagementAppsDetails.class,
R.string.media_management_apps_title);
break;
// TODO: Figure out if there is a way where we can spin up the profile's settings
// process ahead of time, to avoid a long load of data when user clicks on a managed
// app. Maybe when they load the list of apps that contains managed profile apps.
@@ -758,6 +770,8 @@ public class ManageApplications extends InstrumentedFragment
return R.string.help_uri_manage_external_storage;
case LIST_TYPE_ALARMS_AND_REMINDERS:
return R.string.help_uri_alarms_and_reminders;
case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
return R.string.help_uri_media_management_apps;
default:
case LIST_TYPE_MAIN:
return R.string.help_uri_apps;
@@ -1082,6 +1096,8 @@ public class ManageApplications extends InstrumentedFragment
mExtraInfoBridge = new AppStateManageExternalStorageBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_ALARMS_AND_REMINDERS) {
mExtraInfoBridge = new AppStateAlarmsAndRemindersBridge(mContext, mState, this);
} else if (mManageApplications.mListType == LIST_TYPE_MEDIA_MANAGEMENT_APPS) {
mExtraInfoBridge = new AppStateMediaManagementAppsBridge(mContext, mState, this);
} else {
mExtraInfoBridge = null;
}
@@ -1546,6 +1562,9 @@ public class ManageApplications extends InstrumentedFragment
case LIST_TYPE_ALARMS_AND_REMINDERS:
holder.setSummary(AlarmsAndRemindersDetails.getSummary(mContext, entry));
break;
case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
holder.setSummary(MediaManagementAppsDetails.getSummary(mContext, entry));
break;
default:
holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
break;

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -45,6 +45,7 @@ import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.applications.appinfo.DrawOverlayDetails;
import com.android.settings.applications.appinfo.ExternalSourcesDetails;
import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
import com.android.settings.applications.appinfo.MediaManagementAppsDetails;
import com.android.settings.applications.appinfo.WriteSettingsDetails;
import com.android.settings.applications.appops.BackgroundCheckSummary;
import com.android.settings.applications.assist.ManageAssist;
@@ -318,6 +319,7 @@ public class SettingsGateway {
MediaControlsSettings.class.getName(),
NetworkProviderSettings.class.getName(),
AlarmsAndRemindersDetails.class.getName(),
MediaManagementAppsDetails.class.getName()
};
public static final String[] SETTINGS_FOR_RESTRICTED = {