Skip to content

Commit d17e2d5

Browse files
jscott1989jscott1989
committed
Use VERSION_CODES in @TargetApi.
Test: No functionality change. Build checked with ./gradlew assemble Change-Id: I3f1a3384a58feef714ba81b6e3a051ca2d45902d
1 parent 460ba27 commit d17e2d5

15 files changed

+56
-62
lines changed

‎app/src/main/java/com/afwsamples/testdpc/CrossProfileAppsFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.app.Fragment;
55
import android.content.ComponentName;
66
import android.content.pm.CrossProfileApps;
7+
import android.os.Build.VERSION_CODES;
78
import android.os.Bundle;
89
import android.os.UserHandle;
910
import android.view.LayoutInflater;
@@ -13,8 +14,7 @@
1314
import android.widget.TextView;
1415
import java.util.List;
1516

16-
// TODO: Replace it with P.
17-
@TargetApi(28)
17+
@TargetApi(VERSION_CODES.P)
1818
public class CrossProfileAppsFragment extends Fragment {
1919
private static final String TAG = "CrossProfileAppsFragmen";
2020

‎app/src/main/java/com/afwsamples/testdpc/DeviceAdminReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ && isUsingUnifiedPassword(context)) {
504504
}
505505
}
506506

507-
@TargetApi(28)
507+
@TargetApi(VERSION_CODES.P)
508508
private static Boolean isUsingUnifiedPassword(Context context) {
509509
if (!BuildCompat.isAtLeastP()) {
510510
return false;

‎app/src/main/java/com/afwsamples/testdpc/policy/ManageKeepUninstalledPackagesFragment.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
import android.app.admin.DevicePolicyManager;
2121
import android.content.ComponentName;
2222
import android.content.Context;
23+
import android.os.Build.VERSION_CODES;
2324
import android.os.Bundle;
24-
2525
import com.afwsamples.testdpc.DeviceAdminReceiver;
2626
import com.afwsamples.testdpc.R;
27-
2827
import java.util.Collection;
2928
import java.util.Collections;
3029
import java.util.List;
@@ -52,14 +51,14 @@ public void onCreate(Bundle savedInstanceState) {
5251
mAdminComponent = DeviceAdminReceiver.getComponentName(getActivity());
5352
}
5453

55-
@TargetApi(28)
54+
@TargetApi(VERSION_CODES.P)
5655
@Override
5756
protected Collection<String> loadItems() {
5857
List<String> packages = mDevicePolicyManager.getKeepUninstalledPackages(mAdminComponent);
5958
return packages == null ? Collections.emptyList() : packages;
6059
}
6160

62-
@TargetApi(28)
61+
@TargetApi(VERSION_CODES.P)
6362
@Override
6463
protected void saveItems(List<String> items) {
6564
mDevicePolicyManager.setKeepUninstalledPackages(mAdminComponent, items);

‎app/src/main/java/com/afwsamples/testdpc/policy/MeteredDataRestrictionInfoAdapter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,17 @@
1616
package com.afwsamples.testdpc.policy;
1717

1818
import android.annotation.TargetApi;
19-
import android.content.ComponentName;
2019
import android.content.Context;
2120
import android.content.DialogInterface;
2221
import android.content.pm.ApplicationInfo;
2322
import android.content.pm.PackageManager;
2423
import android.content.pm.ResolveInfo;
24+
import android.os.Build.VERSION_CODES;
2525
import android.util.Log;
2626
import android.widget.Toast;
27-
2827
import com.afwsamples.testdpc.DeviceAdminReceiver;
2928
import com.afwsamples.testdpc.R;
3029
import com.afwsamples.testdpc.common.ToggleComponentsArrayAdapter;
31-
3230
import java.util.ArrayList;
3331
import java.util.List;
3432

@@ -96,7 +94,7 @@ public void onClick(DialogInterface dialog, int which) {
9694
}
9795
}
9896

99-
@TargetApi(28)
97+
@TargetApi(VERSION_CODES.P)
10098
private void setMeteredDataRestrictedPkgs(List<String> pkgNames) {
10199
final List<String> excludedPkgs = mDevicePolicyManager.setMeteredDataDisabledPackages(
102100
DeviceAdminReceiver.getComponentName(mContext), pkgNames);

‎app/src/main/java/com/afwsamples/testdpc/policy/OverrideApnFragment.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,26 @@
2424
import android.content.ComponentName;
2525
import android.content.Context;
2626
import android.net.Uri;
27+
import android.os.Build.VERSION_CODES;
2728
import android.os.Bundle;
2829
import android.support.v14.preference.SwitchPreference;
2930
import android.support.v7.preference.Preference;
3031
import android.telephony.data.ApnSetting;
3132
import android.text.TextUtils;
3233
import android.util.Log;
3334
import android.view.View;
34-
import android.widget.AdapterView;
35-
import android.widget.AdapterView.OnItemSelectedListener;
3635
import android.widget.ArrayAdapter;
3736
import android.widget.EditText;
3837
import android.widget.Spinner;
3938
import android.widget.Toast;
40-
4139
import com.afwsamples.testdpc.DeviceAdminReceiver;
4240
import com.afwsamples.testdpc.R;
4341
import com.afwsamples.testdpc.common.BaseSearchablePolicyPreferenceFragment;
44-
4542
import java.net.InetAddress;
4643
import java.net.UnknownHostException;
4744
import java.util.List;
4845

49-
@TargetApi(28)
46+
@TargetApi(VERSION_CODES.P)
5047
public class OverrideApnFragment extends BaseSearchablePolicyPreferenceFragment implements
5148
Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
5249

‎app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ private void setStatusBarDisabled(boolean disable) {
14151415
}
14161416
}
14171417

1418-
@TargetApi(28)
1418+
@TargetApi(VERSION_CODES.P)
14191419
private boolean installKeyPair(final PrivateKey key, final Certificate cert, final String alias,
14201420
boolean isUserSelectable) {
14211421
try {
@@ -1983,7 +1983,7 @@ private void showRemoveUserPrompt() {
19831983
* For user switch:
19841984
* Shows a prompt for choosing a user to be switched to.
19851985
*/
1986-
@TargetApi(28)
1986+
@TargetApi(VERSION_CODES.P)
19871987
private void showSwitchUserPrompt() {
19881988
showChooseUserPrompt(R.string.switch_user, userHandle -> {
19891989
boolean success =
@@ -1996,7 +1996,7 @@ private void showSwitchUserPrompt() {
19961996
* For starting user in background:
19971997
* Shows a prompt for choosing a user to be started in background.
19981998
*/
1999-
@TargetApi(28)
1999+
@TargetApi(VERSION_CODES.P)
20002000
private void showStartUserInBackgroundPrompt() {
20012001
showChooseUserPrompt(R.string.start_user_in_background, userHandle -> {
20022002
int status = mDevicePolicyManager.startUserInBackground(mAdminComponentName, userHandle);
@@ -2010,7 +2010,7 @@ private void showStartUserInBackgroundPrompt() {
20102010
* For user stop:
20112011
* Shows a prompt for choosing a user to be stopped.
20122012
*/
2013-
@TargetApi(28)
2013+
@TargetApi(VERSION_CODES.P)
20142014
private void showStopUserPrompt() {
20152015
showChooseUserPrompt(R.string.stop_user, userHandle -> {
20162016
int status = mDevicePolicyManager.stopUser(mAdminComponentName, userHandle);
@@ -2026,7 +2026,7 @@ private interface UserCallback {
20262026
/**
20272027
* Shows a prompt for choosing a user. The callback will be invoked with chosen user.
20282028
*/
2029-
@TargetApi(28)
2029+
@TargetApi(VERSION_CODES.P)
20302030
private void showChooseUserPrompt(int titleResId, UserCallback callback) {
20312031
if (getActivity() == null || getActivity().isFinishing()) {
20322032
return;
@@ -2052,7 +2052,7 @@ private void showChooseUserPrompt(int titleResId, UserCallback callback) {
20522052
/**
20532053
* Logout the current user.
20542054
*/
2055-
@TargetApi(28)
2055+
@TargetApi(VERSION_CODES.P)
20562056
private void logoutUser() {
20572057
int status = mDevicePolicyManager.logoutUser(mAdminComponentName);
20582058
showToast(status == USER_OPERATION_SUCCESS ? R.string.user_logouted
@@ -2144,7 +2144,7 @@ private void loadSecurityPatch() {
21442144
securityPatchPreference.setSummary(display);
21452145
}
21462146

2147-
@TargetApi(28)
2147+
@TargetApi(VERSION_CODES.P)
21482148
private void loadSeparateChallenge() {
21492149
final Preference separateChallengePreference = findPreference(SEPARATE_CHALLENGE_KEY);
21502150
if (!separateChallengePreference.isEnabled()) {
@@ -2190,14 +2190,14 @@ private void loadPasswordCompliant() {
21902190
}
21912191

21922192

2193-
@TargetApi(28)
2193+
@TargetApi(VERSION_CODES.P)
21942194
private void reloadEnableLogoutUi() {
21952195
if (mEnableLogoutPreference.isEnabled()) {
21962196
mEnableLogoutPreference.setChecked(mDevicePolicyManager.isLogoutEnabled());
21972197
}
21982198
}
21992199

2200-
@TargetApi(28)
2200+
@TargetApi(VERSION_CODES.P)
22012201
private void reloadAutoBrightnessUi() {
22022202
if (mAutoBrightnessPreference.isEnabled()) {
22032203
final String brightnessMode = Settings.System.getString(
@@ -2206,7 +2206,7 @@ private void reloadAutoBrightnessUi() {
22062206
}
22072207
}
22082208

2209-
@TargetApi(28)
2209+
@TargetApi(VERSION_CODES.P)
22102210
private void reloadAffiliatedApis() {
22112211
if (mAffiliatedUserPreference.isEnabled()) {
22122212
mAffiliatedUserPreference.setSummary(
@@ -2222,7 +2222,7 @@ private void reloadAffiliatedApis() {
22222222
mReenableKeyguardPreference.refreshEnabledState();
22232223
}
22242224

2225-
@TargetApi(28)
2225+
@TargetApi(VERSION_CODES.P)
22262226
private void loadIsEphemeralUserUi() {
22272227
if (mEphemeralUserPreference.isEnabled()) {
22282228
boolean isEphemeralUser = mDevicePolicyManager.isEphemeralUser(mAdminComponentName);
@@ -2768,7 +2768,7 @@ public void onClick(DialogInterface dialog, int position) {
27682768
/**
27692769
* Shows a prompt to ask for package name which is used to install an existing package.
27702770
*/
2771-
@TargetApi(28)
2771+
@TargetApi(VERSION_CODES.P)
27722772
private void showInstallExistingPackagePrompt() {
27732773
if (getActivity() == null || getActivity().isFinishing()) {
27742774
return;
@@ -2794,7 +2794,7 @@ private void showInstallExistingPackagePrompt() {
27942794
.show();
27952795
}
27962796

2797-
@TargetApi(23)
2797+
@TargetApi(VERSION_CODES.M)
27982798
private void installApkPackageFromIntent(Intent intent) {
27992799
if (getActivity() == null || getActivity().isFinishing()) {
28002800
return;
@@ -2811,7 +2811,7 @@ private void installApkPackageFromIntent(Intent intent) {
28112811
}
28122812
}
28132813

2814-
@TargetApi(23)
2814+
@TargetApi(VERSION_CODES.M)
28152815
private void showUninstallPackagePrompt() {
28162816
final List<String> installedApps = new ArrayList<>();
28172817
for (ResolveInfo res : getAllLauncherIntentResolversSorted()) {
@@ -2960,7 +2960,7 @@ public void onClick(DialogInterface dialog, int position) {
29602960
/**
29612961
* Shows an alert dialog with a list of packages with metered data disabled.
29622962
*/
2963-
@TargetApi(28)
2963+
@TargetApi(VERSION_CODES.P)
29642964
private void showSetMeteredDataPrompt() {
29652965
final Activity activity = getActivity();
29662966
if (activity == null || activity.isFinishing()) {
@@ -2993,7 +2993,7 @@ private void showSetMeteredDataPrompt() {
29932993
.show();
29942994
}
29952995

2996-
@TargetApi(28)
2996+
@TargetApi(VERSION_CODES.P)
29972997
private List<String> getMeteredDataRestrictedPkgs() {
29982998
return mDevicePolicyManager.getMeteredDataDisabledPackages(mAdminComponentName);
29992999
}
@@ -3002,7 +3002,7 @@ private List<String> getMeteredDataRestrictedPkgs() {
30023002
* Shows an alert dialog which displays a list of apps. Clicking an app in the dialog clear the
30033003
* app data.
30043004
*/
3005-
@TargetApi(28)
3005+
@TargetApi(VERSION_CODES.P)
30063006
private void showClearAppDataPrompt() {
30073007
final List<String> packageNameList =
30083008
getAllInstalledApplicationsSorted()
@@ -3024,7 +3024,7 @@ private void showClearAppDataPrompt() {
30243024
}
30253025
}
30263026

3027-
@TargetApi(28)
3027+
@TargetApi(VERSION_CODES.P)
30283028
private void clearApplicationUserData(String packageName) {
30293029
mDevicePolicyManager.clearApplicationUserData(
30303030
mAdminComponentName,
@@ -3317,7 +3317,7 @@ private void showFragment(final Fragment fragment, String tag) {
33173317
.replace(R.id.container, fragment, tag).commit();
33183318
}
33193319

3320-
@TargetApi(28)
3320+
@TargetApi(VERSION_CODES.P)
33213321
private void relaunchInLockTaskMode() {
33223322
final Intent intent = new Intent(getActivity(), getActivity().getClass());
33233323
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -3381,7 +3381,7 @@ private void showSetupManagement() {
33813381
* Shows a dialog that asks the user for a screen brightness value, then sets the screen
33823382
* brightness to these values.
33833383
*/
3384-
@TargetApi(28)
3384+
@TargetApi(VERSION_CODES.P)
33853385
private void showSetScreenBrightnessDialog() {
33863386
if (getActivity() == null || getActivity().isFinishing()) {
33873387
return;
@@ -3466,7 +3466,7 @@ private void showSetScreenOffTimeoutDialog() {
34663466
/**
34673467
* Shows a dialog that asks the user for a timestamp, then sets the system time to this value.
34683468
*/
3469-
@TargetApi(28)
3469+
@TargetApi(VERSION_CODES.P)
34703470
private void showSetTimeDialog() {
34713471
if (getActivity() == null || getActivity().isFinishing()) {
34723472
return;
@@ -3505,7 +3505,7 @@ private void showSetTimeDialog() {
35053505
* Shows a dialog that asks the user for a timezone id, then sets the system timezone to
35063506
* this value.
35073507
*/
3508-
@TargetApi(28)
3508+
@TargetApi(VERSION_CODES.P)
35093509
private void showSetTimeZoneDialog() {
35103510
if (getActivity() == null || getActivity().isFinishing()) {
35113511
return;
@@ -3541,7 +3541,7 @@ private void showSetTimeZoneDialog() {
35413541
/**
35423542
* Shows a dialog that asks the user to set a profile name.
35433543
*/
3544-
@TargetApi(28)
3544+
@TargetApi(VERSION_CODES.P)
35453545
private void showSetProfileNameDialog() {
35463546
if (getActivity() == null || getActivity().isFinishing()) {
35473547
return;
@@ -3607,7 +3607,7 @@ private void removeAccount(Account account) {
36073607
}, null);
36083608
}
36093609

3610-
@TargetApi(28)
3610+
@TargetApi(VERSION_CODES.P)
36113611
private int validateAffiliatedUserAfterP() {
36123612
if (Build.VERSION.SDK_INT >= VERSION_CODES.P) {
36133613
if (!mDevicePolicyManager.isAffiliatedUser()) {

‎app/src/main/java/com/afwsamples/testdpc/policy/SecurityLogsFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private void processEvents(List<SecurityEvent> logs) {
140140
}
141141
}
142142

143-
@TargetApi(28)
143+
@TargetApi(VERSION_CODES.P)
144144
private long getEventId(SecurityEvent event) {
145145
return event.getId();
146146
}

‎app/src/main/java/com/afwsamples/testdpc/policy/SetUserSessionMessageFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.app.admin.DevicePolicyManager;
2222
import android.content.ComponentName;
2323
import android.content.Context;
24+
import android.os.Build.VERSION_CODES;
2425
import android.os.Bundle;
2526
import android.view.LayoutInflater;
2627
import android.view.View;
@@ -29,7 +30,7 @@
2930
import com.afwsamples.testdpc.DeviceAdminReceiver;
3031
import com.afwsamples.testdpc.R;
3132

32-
@TargetApi(28)
33+
@TargetApi(VERSION_CODES.P)
3334
public class SetUserSessionMessageFragment extends Fragment
3435
implements View.OnClickListener {
3536
private static final String TAG = "SetUserSessionMessage";

0 commit comments

Comments
 (0)