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

Revert "[Settings] Convert to getSystemService(Class<T>)"

Browse Source 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
This commit is contained in:
Bonian Chen
2021-03-31 09:37:03 +00:00
parent 13fb77c652
commit d6f54ed90b
64 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -319,7 +319,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
@VisibleForTesting
static boolean appHasVpnPermission(Context context, @NonNull ApplicationInfo application) {
final AppOpsManager service =
context.getSystemService(AppOpsManager.class);
(AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
final List<AppOpsManager.PackageOps> ops = service.getOpsForPackage(application.uid,
application.packageName, new int[]{OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN});
return !ArrayUtils.isEmpty(ops);

8
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -116,9 +116,9 @@ public class VpnSettings extends RestrictedSettingsFragment implements
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
mUserManager = getSystemService(UserManager.class);
mConnectivityManager = getSystemService(ConnectivityManager.class);
mVpnManager = getSystemService(VpnManager.class);
mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
mVpnManager = (VpnManager) getSystemService(Context.VPN_MANAGEMENT_SERVICE);
mUnavailable = isUiRestricted();
setHasOptionsMenu(!mUnavailable);
@@ -509,7 +509,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
}
// Fetch VPN-enabled apps from AppOps.
AppOpsManager aom = context.getSystemService(AppOpsManager.class);
AppOpsManager aom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
List<AppOpsManager.PackageOps> apps =
aom.getPackagesForOps(new int[] {OP_ACTIVATE_VPN, OP_ACTIVATE_PLATFORM_VPN});
if (apps != null) {