Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev

This commit is contained in:
Bonian Chen
2021-03-24 04:13:35 +00:00
committed by Android (Google) Code Review
63 changed files with 103 additions and 103 deletions

View File

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