Skip to content

Commit 9403db0

Browse files
jscott1989jscott1989
committed
Remove deprecated isAtLeast methods.
Test: No functional change. Verified build with ./gradlew assemble Change-Id: Ic2253486bb883d55ff2898fc4b7e9650ca5c424b
1 parent 6067579 commit 9403db0

16 files changed

+78
-87
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
import android.content.ComponentName;
2929
import android.content.Context;
3030
import android.content.Intent;
31+
import android.os.Build;
32+
import android.os.Build.VERSION_CODES;
3133
import android.os.Bundle;
3234
import android.os.UserManager;
33-
import android.support.v4.os.BuildCompat;
3435
import android.text.TextUtils;
3536
import android.util.Log;
3637
import android.view.View;
@@ -122,7 +123,7 @@ private void addAccount(String accountName) {
122123
}
123124

124125
private void disableUserRestrictions() {
125-
if (BuildCompat.isAtLeastN()) {
126+
if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
126127
// DPC is allowed to bypass DISALLOW_MODIFY_ACCOUNTS on N or above.
127128
Log.v(TAG, "skip disabling user restriction on N or above");
128129
return;
@@ -135,7 +136,7 @@ private void disableUserRestrictions() {
135136
}
136137

137138
private void restoreUserRestrictions() {
138-
if (BuildCompat.isAtLeastN()) {
139+
if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
139140
// DPC is allowed to bypass DISALLOW_MODIFY_ACCOUNTS on N or above.
140141
Log.v(TAG, "skip restoring user restrictions on N or above");
141142
return;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import android.content.ComponentName;
2525
import android.content.Context;
2626
import android.os.AsyncTask;
27+
import android.os.Build;
2728
import android.os.Build.VERSION_CODES;
2829
import android.os.Process;
2930
import android.preference.PreferenceManager;
30-
import android.support.v4.os.BuildCompat;
3131
import android.text.TextUtils;
3232
import android.util.Log;
3333
import android.widget.Toast;
@@ -92,7 +92,7 @@ public static void onNetworkLogsAvailable(Context context, ComponentName admin,
9292
context.getString(R.string.on_network_logs_available_success, batchToken));
9393

9494
ArrayList<String> loggedEvents = new ArrayList<>();
95-
if (BuildCompat.isAtLeastP()) {
95+
if (Build.VERSION.SDK_INT >= VERSION_CODES.P) {
9696
for (NetworkEvent event : events) {
9797
loggedEvents.add(event.toString());
9898
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
import android.net.Uri;
2727
import android.os.AsyncTask;
2828
import android.os.Binder;
29+
import android.os.Build;
2930
import android.os.Build.VERSION_CODES;
3031
import android.os.ParcelFileDescriptor;
3132
import android.os.PersistableBundle;
3233
import android.os.Process;
3334
import android.os.UserHandle;
3435
import android.os.UserManager;
3536
import android.support.v4.app.NotificationCompat;
36-
import android.support.v4.os.BuildCompat;
3737
import android.util.Log;
3838
import android.widget.Toast;
3939
import com.afwsamples.testdpc.common.NotificationUtil;
@@ -506,7 +506,7 @@ && isUsingUnifiedPassword(context)) {
506506

507507
@TargetApi(VERSION_CODES.P)
508508
private static Boolean isUsingUnifiedPassword(Context context) {
509-
if (!BuildCompat.isAtLeastP()) {
509+
if (Build.VERSION.SDK_INT < VERSION_CODES.P) {
510510
return false;
511511
}
512512
final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import android.os.Build.VERSION_CODES;
4242
import android.os.Bundle;
4343
import android.os.PersistableBundle;
44-
import android.support.v4.os.BuildCompat;
4544
import android.view.LayoutInflater;
4645
import android.view.View;
4746
import android.view.ViewGroup;
@@ -162,7 +161,7 @@ public void onResume() {
162161

163162
if (setProvisioningMethodsVisibility()) {
164163
// The extra logo uri and color are supported only from N
165-
if (BuildCompat.isAtLeastN()) {
164+
if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
166165
getView().findViewById(R.id.params_title).setVisibility(View.VISIBLE);
167166
if (canAnAppHandleGetContent()) {
168167
getView().findViewById(
@@ -190,15 +189,19 @@ private void setProvisioningModeSpecificUI() {
190189
final int setUpOptionId = mSetupOptions.getCheckedRadioButtonId();
191190
final boolean isManagedProfileAction = setUpOptionId == R.id.setup_managed_profile;
192191
final boolean isManagedDeviceAction = setUpOptionId == R.id.setup_device_owner;
193-
mSkipUserConsent.setVisibility(BuildCompat.isAtLeastO() && isManagedProfileAction &&
194-
Util.isDeviceOwner(getActivity())
192+
mSkipUserConsent.setVisibility(
193+
Build.VERSION.SDK_INT >= VERSION_CODES.O
194+
&& isManagedProfileAction
195+
&& Util.isDeviceOwner(getActivity())
195196
? View.VISIBLE
196197
: View.GONE);
197-
mKeepAccountMigrated.setVisibility(BuildCompat.isAtLeastO() && isManagedProfileAction
198+
mKeepAccountMigrated.setVisibility(
199+
Build.VERSION.SDK_INT >= VERSION_CODES.O && isManagedProfileAction
198200
? View.VISIBLE
199201
: View.GONE);
200-
mSkipEncryption.setVisibility((isManagedProfileAction && BuildCompat.isAtLeastN())
201-
|| (isManagedDeviceAction && Util.isAtLeastM())
202+
mSkipEncryption.setVisibility(
203+
(isManagedProfileAction && Build.VERSION.SDK_INT >= VERSION_CODES.N)
204+
|| (isManagedDeviceAction && Build.VERSION.SDK_INT >= VERSION_CODES.M)
202205
? View.VISIBLE
203206
: View.GONE);
204207

@@ -273,7 +276,7 @@ private void maybeSpecifySyncAuthExtras(Intent intent, PersistableBundle adminEx
273276
private void maybePassAffiliationIds(Intent intent, PersistableBundle adminExtras) {
274277
if (Util.isDeviceOwner(getActivity())
275278
&& ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
276-
&& BuildCompat.isAtLeastO()) {
279+
&& Build.VERSION.SDK_INT >= VERSION_CODES.O) {
277280
passAffiliationIds(intent, adminExtras);
278281
}
279282
}
@@ -299,15 +302,15 @@ private void passAffiliationIds(Intent intent, PersistableBundle adminExtras) {
299302
* @return true if we can launch the intent
300303
*/
301304
private boolean maybeSpecifyNExtras(Intent intent) {
302-
if (BuildCompat.isAtLeastN()) {
305+
if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
303306
specifyLogoUri(intent);
304307
specifyColor(intent);
305308
}
306309
return true;
307310
}
308311

309312
private void specifyDefaultDisclaimers(Intent intent) {
310-
if (BuildCompat.isAtLeastO()) {
313+
if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
311314
Bundle emmBundle = new Bundle();
312315
emmBundle.putString(DevicePolicyManager.EXTRA_PROVISIONING_DISCLAIMER_HEADER,
313316
getString(R.string.default_disclaimer_emm_name));
@@ -331,16 +334,19 @@ private static Uri resourceToUri(Context context, int resID) {
331334
}
332335

333336
private void specifySkipUserConsent(Intent intent) {
334-
if (BuildCompat.isAtLeastO() && ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
335-
&& mSkipUserConsent.getVisibility() == View.VISIBLE) {
336-
intent.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_USER_CONSENT,
337-
mSkipUserConsent.isChecked());
337+
if (Build.VERSION.SDK_INT >= VERSION_CODES.O
338+
&& ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
339+
&& mSkipUserConsent.getVisibility() == View.VISIBLE) {
340+
intent.putExtra(
341+
DevicePolicyManager.EXTRA_PROVISIONING_SKIP_USER_CONSENT,
342+
mSkipUserConsent.isChecked());
338343
}
339344
}
340345

341346
private void specifyKeepAccountMigrated(Intent intent) {
342-
if (BuildCompat.isAtLeastO() && ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
343-
&& mKeepAccountMigrated.getVisibility() == View.VISIBLE) {
347+
if (Build.VERSION.SDK_INT >= VERSION_CODES.O
348+
&& ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
349+
&& mKeepAccountMigrated.getVisibility() == View.VISIBLE) {
344350
intent.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION,
345351
mKeepAccountMigrated.isChecked());
346352
}

‎app/src/main/java/com/afwsamples/testdpc/common/NotificationUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import android.app.NotificationChannel;
55
import android.app.NotificationManager;
66
import android.content.Context;
7+
import android.os.Build;
78
import android.os.Build.VERSION_CODES;
89
import android.support.annotation.RequiresApi;
910
import android.support.annotation.StringRes;
1011
import android.support.v4.app.NotificationCompat;
11-
import android.support.v4.os.BuildCompat;
1212
import com.afwsamples.testdpc.R;
1313

1414
public class NotificationUtil {
@@ -40,7 +40,7 @@ public static void showNotification(
4040
}
4141

4242
public static NotificationCompat.Builder getNotificationBuilder(Context context) {
43-
if (BuildCompat.isAtLeastO()) {
43+
if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
4444
createDefaultNotificationChannel(context);
4545
}
4646
NotificationCompat.Builder builder

‎app/src/main/java/com/afwsamples/testdpc/common/ProfileOrParentFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
import android.app.admin.DevicePolicyManager;
2222
import android.content.ComponentName;
2323
import android.content.Context;
24+
import android.os.Build;
2425
import android.os.Build.VERSION_CODES;
2526
import android.os.Bundle;
2627
import android.support.v13.app.FragmentTabHost;
27-
import android.support.v4.os.BuildCompat;
2828
import android.support.v7.preference.PreferenceManager;
2929
import android.view.LayoutInflater;
3030
import android.view.View;
3131
import android.view.ViewGroup;
32-
3332
import com.afwsamples.testdpc.DeviceAdminReceiver;
3433
import com.afwsamples.testdpc.R;
3534

@@ -66,7 +65,8 @@ public View onCreateView(
6665
tabHost.setup(getActivity(), getChildFragmentManager(), View.generateViewId());
6766

6867
final boolean showDualTabs =
69-
Util.isManagedProfileOwner(getActivity()) && BuildCompat.isAtLeastN();
68+
Util.isManagedProfileOwner(getActivity())
69+
&& Build.VERSION.SDK_INT >= VERSION_CODES.N;
7070

7171
// Tab for the parent profile
7272
if (showDualTabs) {

‎app/src/main/java/com/afwsamples/testdpc/common/ProvisioningStateUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.os.Build;
2828
import android.os.Build.VERSION_CODES;
2929
import android.provider.Settings;
30-
import android.support.v4.os.BuildCompat;
3130
import java.util.List;
3231

3332
/**
@@ -94,7 +93,7 @@ public static boolean isManaged(Context context) {
9493
*/
9594
@TargetApi(VERSION_CODES.N)
9695
public static boolean isProvisioningAllowed(Context context, String action) {
97-
if (BuildCompat.isAtLeastN()) {
96+
if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
9897
DevicePolicyManager dpm = (DevicePolicyManager) context
9998
.getSystemService(Context.DEVICE_POLICY_SERVICE);
10099
return dpm.isProvisioningAllowed(action);

‎app/src/main/java/com/afwsamples/testdpc/common/Util.java

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,12 @@
3333
import android.os.UserHandle;
3434
import android.os.UserManager;
3535
import android.support.v14.preference.PreferenceFragment;
36-
import android.support.v4.os.BuildCompat;
3736
import android.text.format.DateUtils;
3837
import android.util.Log;
3938
import android.widget.ImageView;
4039
import android.widget.Toast;
41-
4240
import com.afwsamples.testdpc.DeviceAdminReceiver;
4341
import com.afwsamples.testdpc.R;
44-
4542
import java.io.ByteArrayOutputStream;
4643
import java.io.FileNotFoundException;
4744
import java.io.IOException;
@@ -111,7 +108,7 @@ public static void updateImageView(Context context, ImageView imageView, Uri uri
111108
public static boolean isManagedProfileOwner(Context context) {
112109
final DevicePolicyManager dpm = getDevicePolicyManager(context);
113110

114-
if (BuildCompat.isAtLeastN()) {
111+
if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
115112
try {
116113
return dpm.isManagedProfile(DeviceAdminReceiver.getComponentName(context));
117114
} catch (SecurityException ex) {
@@ -128,7 +125,7 @@ public static boolean isManagedProfileOwner(Context context) {
128125

129126
@TargetApi(VERSION_CODES.M)
130127
public static boolean isPrimaryUser(Context context) {
131-
if (isAtLeastM()) {
128+
if (Build.VERSION.SDK_INT >= VERSION_CODES.M) {
132129
UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
133130
return userManager.isSystemUser();
134131
} else {
@@ -150,19 +147,9 @@ public static boolean isProfileOwner(Context context) {
150147
return dpm.isProfileOwnerApp(context.getPackageName());
151148
}
152149

153-
public static boolean isAtLeastM() {
154-
return Build.VERSION.SDK_INT >= VERSION_CODES.M;
155-
}
156-
157-
public static boolean isAtLeastQ() {
158-
return VERSION.CODENAME.length() == 1
159-
&& VERSION.CODENAME.charAt(0) >= 'Q'
160-
&& VERSION.CODENAME.charAt(0) <= 'Z';
161-
}
162-
163150
@TargetApi(VERSION_CODES.O)
164151
public static List<UserHandle> getBindDeviceAdminTargetUsers(Context context) {
165-
if (!BuildCompat.isAtLeastO()) {
152+
if (Build.VERSION.SDK_INT < VERSION_CODES.O) {
166153
return Collections.emptyList();
167154
}
168155

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.afwsamples.testdpc.policy;
1818

1919
import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
20-
import static com.afwsamples.testdpc.common.Util.isAtLeastQ;
2120
import static com.afwsamples.testdpc.common.preference.DpcPreferenceHelper.NO_CUSTOM_CONSTRIANT;
2221

2322
import android.accessibilityservice.AccessibilityServiceInfo;
@@ -63,7 +62,6 @@
6362
import android.support.annotation.StringRes;
6463
import android.support.v14.preference.SwitchPreference;
6564
import android.support.v4.content.FileProvider;
66-
import android.support.v4.os.BuildCompat;
6765
import android.support.v7.preference.EditTextPreference;
6866
import android.support.v7.preference.ListPreference;
6967
import android.support.v7.preference.Preference;
@@ -400,7 +398,7 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
400398

401399
private static final SparseIntArray PASSWORD_COMPLEXITY = new SparseIntArray(4);
402400
static {
403-
if (isAtLeastQ()) {
401+
if (Build.VERSION.SDK_INT >= VERSION_CODES.Q) {
404402
final int[] complexityIds = new int[]{
405403
DevicePolicyManager.PASSWORD_COMPLEXITY_NONE,
406404
DevicePolicyManager.PASSWORD_COMPLEXITY_LOW,
@@ -727,7 +725,7 @@ private void onCreateSetNewPasswordWithComplexityPreference() {
727725

728726
private void constrainSpecialCasePreferences() {
729727
// Reset password can be used in all contexts since N
730-
if (BuildCompat.isAtLeastN()) {
728+
if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
731729
((DpcPreference) findPreference(RESET_PASSWORD_KEY)).clearNonCustomConstraints();
732730
}
733731
}
@@ -805,7 +803,7 @@ public void onPositiveButtonClicked(String[] lockTaskArray) {
805803
showFragment(new SetLockTaskFeaturesFragment());
806804
return true;
807805
case RESET_PASSWORD_KEY:
808-
if (BuildCompat.isAtLeastO()) {
806+
if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
809807
showFragment(new ResetPasswordWithTokenFragment());
810808
return true;
811809
} else {
@@ -1218,9 +1216,10 @@ private void showPendingSystemUpdate() {
12181216

12191217
@TargetApi(VERSION_CODES.O)
12201218
private void lockNow() {
1221-
if (BuildCompat.isAtLeastO() && Util.isManagedProfileOwner(getActivity())) {
1219+
if (Build.VERSION.SDK_INT >= VERSION_CODES.O && Util.isManagedProfileOwner(getActivity())) {
12221220
showLockNowPrompt();
1223-
} else if (BuildCompat.isAtLeastN() && Util.isManagedProfileOwner(getActivity())) {
1221+
} else if (Build.VERSION.SDK_INT >= VERSION_CODES.N
1222+
&& Util.isManagedProfileOwner(getActivity())) {
12241223
// Always call lock now on the parent for managed profile on N
12251224
mDevicePolicyManager.getParentProfileInstance(mAdminComponentName).lockNow();
12261225
} else {
@@ -1419,7 +1418,7 @@ private void setStatusBarDisabled(boolean disable) {
14191418
private boolean installKeyPair(final PrivateKey key, final Certificate cert, final String alias,
14201419
boolean isUserSelectable) {
14211420
try {
1422-
if (BuildCompat.isAtLeastP()) {
1421+
if (Build.VERSION.SDK_INT >= VERSION_CODES.P) {
14231422

14241423
return mDevicePolicyManager.installKeyPair(
14251424
mAdminComponentName, key, new Certificate[]{cert}, alias,
@@ -1968,7 +1967,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
19681967
* {@link DevicePolicyManager#getSecondaryUsers} is not available.
19691968
*/
19701969
private void showRemoveUserPrompt() {
1971-
if (BuildCompat.isAtLeastP()) {
1970+
if (Build.VERSION.SDK_INT >= VERSION_CODES.P) {
19721971
showChooseUserPrompt(R.string.remove_user, userHandle -> {
19731972
boolean success =
19741973
mDevicePolicyManager.removeUser(mAdminComponentName, userHandle);
@@ -2428,8 +2427,8 @@ private void showPromptForKeyCertificateAlias(final PrivateKey key,
24282427

24292428
final CheckBox userSelectableCheckbox = passwordInputView.findViewById(
24302429
R.id.alias_user_selectable);
2431-
userSelectableCheckbox.setEnabled(BuildCompat.isAtLeastP());
2432-
userSelectableCheckbox.setChecked(!BuildCompat.isAtLeastP());
2430+
userSelectableCheckbox.setEnabled(Build.VERSION.SDK_INT >= VERSION_CODES.P);
2431+
userSelectableCheckbox.setChecked(Build.VERSION.SDK_INT < VERSION_CODES.P);
24332432

24342433
new AlertDialog.Builder(getActivity())
24352434
.setTitle(getString(R.string.certificate_alias_prompt_title))
@@ -2476,7 +2475,7 @@ private void showPromptForGeneratedKeyAlias(String alias) {
24762475

24772476
final CheckBox userSelectableCheckbox = aliasNamingView.findViewById(
24782477
R.id.alias_user_selectable);
2479-
userSelectableCheckbox.setChecked(!BuildCompat.isAtLeastP());
2478+
userSelectableCheckbox.setChecked(Build.VERSION.SDK_INT < VERSION_CODES.P);
24802479

24812480
final CheckBox ecKeyCheckbox = aliasNamingView.findViewById(
24822481
R.id.generate_ec_key);

0 commit comments

Comments
 (0)