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

Merge "Add restricted settings UI in Settings accessibility screeen"

Browse Source
This commit is contained in:
Ricky Wai
2022-01-28 11:23:17 +00:00
committed by Android (Google) Code Review
parent 8f94676bc3 c76a11f0c1
commit d3fe360d26
11 changed files with 315 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
View File

@@ -21,6 +21,7 @@ import static com.android.internal.accessibility.AccessibilityShortcutController
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -49,6 +50,7 @@ import java.util.Set;
public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
private final static String TAG = "A11yDetailsSettings";
private AppOpsManager mAppOps;
@Override
public int getMetricsCategory() {
@@ -59,6 +61,8 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mAppOps = getActivity().getSystemService(AppOpsManager.class);
// In case the Intent doesn't have component name, go to a11y services list.
final String extraComponentName = getActivity().getIntent().getStringExtra(
Intent.EXTRA_COMPONENT_NAME);
@@ -127,10 +131,11 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
}
// In case this accessibility service isn't permitted, go to a11y services list.
if (!isServiceAllowed(componentName.getPackageName())) {
if (!isServiceAllowed(info.getResolveInfo().serviceInfo.applicationInfo.uid,
componentName.getPackageName())) {
Log.w(TAG,
"openAccessibilityDetailsSettingsAndFinish: target accessibility service is"
+ "prohibited by Device Admin.");
+ "prohibited by Device Admin or App Op.");
return false;
}
openSubSettings(ToggleAccessibilityServicePreferenceFragment.class.getName(),
@@ -148,11 +153,21 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
}
@VisibleForTesting
boolean isServiceAllowed(String packageName) {
boolean isServiceAllowed(int uid, String packageName) {
final DevicePolicyManager dpm = getContext().getSystemService(DevicePolicyManager.class);
final List<String> permittedServices = dpm.getPermittedAccessibilityServices(
UserHandle.myUserId());
return (permittedServices == null || permittedServices.contains(packageName));
if (permittedServices != null && !permittedServices.contains(packageName)) {
return false;
}
try {
final int mode = mAppOps.noteOpNoThrow(AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,
uid, packageName);
return mode != AppOpsManager.MODE_ERRORED && mode != AppOpsManager.MODE_IGNORED;
} catch (Exception e) {
// Fallback in case if app ops is not available in testing.
return true;
}
}
private AccessibilityServiceInfo getAccessibilityServiceInfo(ComponentName componentName) {

61
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -20,6 +20,7 @@ import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIU
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.AccessibilityShortcutInfo;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -200,6 +201,12 @@ public class AccessibilitySettings extends DashboardFragment {
registerContentMonitors();
}
@Override
public void onResume() {
super.onResume();
updateAllPreferences();
}
@Override
public void onStart() {
if (mNeedPreferencesUpdate) {
@@ -506,11 +513,13 @@ public class AccessibilitySettings extends DashboardFragment {
private final Context mContext;
private final DevicePolicyManager mDpm;
private final PackageManager mPm;
private final AppOpsManager mAppOps;
RestrictedPreferenceHelper(Context context) {
mContext = context;
mDpm = context.getSystemService(DevicePolicyManager.class);
mPm = context.getPackageManager();
mAppOps = context.getSystemService(AppOpsManager.class);
}
/**
@@ -553,14 +562,11 @@ public class AccessibilitySettings extends DashboardFragment {
}
final RestrictedPreference preference = createRestrictedPreference(key, title,
summary, icon, fragment);
summary, icon, fragment, packageName,
resolveInfo.serviceInfo.applicationInfo.uid);
// permittedServices null means all accessibility services are allowed.
final boolean serviceAllowed =
permittedServices == null || permittedServices.contains(packageName);
setRestrictedPreferenceEnabled(preference, permittedServices, serviceEnabled);
setRestrictedPreferenceEnabled(preference, packageName, serviceAllowed,
serviceEnabled);
final String prefKey = preference.getKey();
final int imageRes = info.getAnimatedImageRes();
final CharSequence description = getServiceDescription(mContext, info,
@@ -614,16 +620,11 @@ public class AccessibilitySettings extends DashboardFragment {
}
final RestrictedPreference preference = createRestrictedPreference(key, title,
summary, icon, fragment);
final String packageName = componentName.getPackageName();
// permittedServices null means all accessibility services are allowed.
final boolean serviceAllowed =
permittedServices == null || permittedServices.contains(packageName);
summary, icon, fragment, componentName.getPackageName(),
activityInfo.applicationInfo.uid);
final boolean serviceEnabled = enabledServices.contains(componentName);
setRestrictedPreferenceEnabled(preference, packageName, serviceAllowed,
serviceEnabled);
setRestrictedPreferenceEnabled(preference, permittedServices, serviceEnabled);
final String prefKey = preference.getKey();
final String description = info.loadDescription(mPm);
@@ -633,7 +634,7 @@ public class AccessibilitySettings extends DashboardFragment {
putBasicExtras(preference, prefKey, title, description, imageRes, htmlDescription,
componentName);
putSettingsExtras(preference, packageName, settingsClassName);
putSettingsExtras(preference, componentName.getPackageName(), settingsClassName);
preferenceList.add(preference);
}
@@ -659,8 +660,9 @@ public class AccessibilitySettings extends DashboardFragment {
}
private RestrictedPreference createRestrictedPreference(String key, CharSequence title,
CharSequence summary, Drawable icon, String fragment) {
final RestrictedPreference preference = new RestrictedPreference(mContext);
CharSequence summary, Drawable icon, String fragment, String packageName, int uid) {
final RestrictedPreference preference = new RestrictedPreference(mContext, packageName,
uid);
preference.setKey(key);
preference.setTitle(title);
@@ -675,16 +677,37 @@ public class AccessibilitySettings extends DashboardFragment {
}
private void setRestrictedPreferenceEnabled(RestrictedPreference preference,
String packageName, boolean serviceAllowed, boolean serviceEnabled) {
final List<String> permittedServices, boolean serviceEnabled) {
// permittedServices null means all accessibility services are allowed.
boolean serviceAllowed = permittedServices == null || permittedServices.contains(
preference.getPackageName());
boolean appOpsAllowed;
if (serviceAllowed) {
try {
final int mode = mAppOps.noteOpNoThrow(
AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,
preference.getUid(), preference.getPackageName());
appOpsAllowed = mode == AppOpsManager.MODE_ALLOWED;
serviceAllowed = appOpsAllowed;
} catch (Exception e) {
// Allow service in case if app ops is not available in testing.
appOpsAllowed = true;
}
} else {
appOpsAllowed = false;
}
if (serviceAllowed || serviceEnabled) {
preference.setEnabled(true);
} else {
// Disable accessibility service that are not permitted.
final EnforcedAdmin admin =
RestrictedLockUtilsInternal.checkIfAccessibilityServiceDisallowed(
mContext, packageName, UserHandle.myUserId());
mContext, preference.getPackageName(), UserHandle.myUserId());
if (admin != null) {
preference.setDisabledByAdmin(admin);
} else if (!appOpsAllowed) {
preference.setDisabledByAppOps(true);
} else {
preference.setEnabled(false);
}