Skip to content

Commit 1e41cf8

Browse files
author
android-build-team Robot
committed
Snap for 5628009 from bf32fc023325e102809eeeb2d231843b945893a7 to ub-testdpc-qt-release
Change-Id: I511d396b89767fd39114b50651ea1daec3ad4d0f
2 parents 26d0b40 + e11de3f commit 1e41cf8

File tree

9 files changed

+17
-31
lines changed

9 files changed

+17
-31
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ ext {
99
// exactly 1 digit
1010
versionMinor = 1
1111
// exactly 2 digits
12-
versionBuild = 01
12+
versionBuild = 00
1313
}
1414

1515
android {
16-
compileSdkVersion 'android-Q'
16+
compileSdkVersion 'android-29'
1717
buildToolsVersion "28.0.0"
1818

1919
defaultConfig {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616

1717
package com.afwsamples.testdpc;
1818

19-
import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
20-
2119
import android.annotation.TargetApi;
2220
import android.content.Context;
2321
import android.content.Intent;
2422
import android.net.Uri;
2523
import android.os.Build.VERSION_CODES;
2624

27-
@TargetApi(Q_VERSION_CODE)
25+
@TargetApi(VERSION_CODES.Q)
2826
public class DelegatedAdminReceiver extends android.app.admin.DelegatedAdminReceiver {
2927

3028
@Override

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,13 @@ public class Util {
6161
private static final boolean IS_RUNNING_Q =
6262
VERSION.CODENAME.length() == 1 && VERSION.CODENAME.charAt(0) == 'Q';
6363

64-
public static final int Q_VERSION_CODE = 29;
65-
6664
/**
6765
* A replacement for {@link VERSION.SDK_INT} that is compatible with pre-release SDKs
6866
*
6967
* <p>This will be set to the version SDK, or {@link VERSION_CODES.CUR_DEVELOPMENT} if the SDK
7068
* int is not yet assigned.
7169
**/
72-
public static final int SDK_INT = IS_RUNNING_Q ? Q_VERSION_CODE : VERSION.SDK_INT;
70+
public static final int SDK_INT = IS_RUNNING_Q ? VERSION_CODES.Q : VERSION.SDK_INT;
7371

7472
/**
7573
* Format a friendly datetime for the current locale according to device policy documentation.

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.afwsamples.testdpc.policy;
1818

19-
import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
20-
2119
import android.annotation.TargetApi;
2220
import android.app.AlertDialog.Builder;
2321
import android.app.admin.DevicePolicyManager;
@@ -38,7 +36,7 @@
3836
import java.util.Collections;
3937
import java.util.Set;
4038

41-
@TargetApi(Q_VERSION_CODE)
39+
@TargetApi(VERSION_CODES.Q)
4240
public class CrossProfileCalendarFragment extends BaseSearchablePolicyPreferenceFragment implements
4341
Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
4442

@@ -104,7 +102,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
104102
return false;
105103
}
106104

107-
@TargetApi(Q_VERSION_CODE)
105+
@TargetApi(VERSION_CODES.Q)
108106
private void reloadAllowAllPackagesUi() {
109107
final Set<String> packages =
110108
mDevicePolicyManager.getCrossProfileCalendarPackages(mAdminComponentName);

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

Lines changed: 3 additions & 4 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.Q_VERSION_CODE;
2120
import static com.afwsamples.testdpc.common.preference.DpcPreferenceHelper.NO_CUSTOM_CONSTRIANT;
2221

2322
import android.accessibilityservice.AccessibilityServiceInfo;
@@ -399,7 +398,7 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
399398

400399
private static final SparseIntArray PASSWORD_COMPLEXITY = new SparseIntArray(4);
401400
static {
402-
if (Util.SDK_INT >= Q_VERSION_CODE) {
401+
if (Util.SDK_INT >= VERSION_CODES.Q) {
403402
final int[] complexityIds = new int[]{
404403
DevicePolicyManager.PASSWORD_COMPLEXITY_NONE,
405404
DevicePolicyManager.PASSWORD_COMPLEXITY_LOW,
@@ -1142,7 +1141,7 @@ public void onPositiveButtonClicked(String[] lockTaskArray) {
11421141
return false;
11431142
}
11441143

1145-
@TargetApi(Q_VERSION_CODE)
1144+
@TargetApi(VERSION_CODES.Q)
11461145
private void promptInstallUpdate() {
11471146
new AlertDialog.Builder(getActivity())
11481147
.setMessage(R.string.install_update_prompt)
@@ -1155,7 +1154,7 @@ private void promptInstallUpdate() {
11551154
.show();
11561155
}
11571156

1158-
@TargetApi(Q_VERSION_CODE)
1157+
@TargetApi(VERSION_CODES.Q)
11591158
private void installUpdate() {
11601159
File file = new File(getContext().getFilesDir(), "ota.zip");
11611160
Uri uri = FileProvider.getUriForFile(

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

Lines changed: 1 addition & 2 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.Q_VERSION_CODE;
2120

2221
import android.app.AlertDialog;
2322
import android.app.admin.DevicePolicyManager;
@@ -151,7 +150,7 @@ private void constrainPreferences() {
151150
}
152151
for (String restriction: UserRestriction.QT_PLUS_RESTRICTIONS) {
153152
DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
154-
pref.setMinSdkVersion(Q_VERSION_CODE);
153+
pref.setMinSdkVersion(VERSION_CODES.Q);
155154
}
156155
for (String restriction : UserRestriction.PRIMARY_USER_ONLY_RESTRICTIONS) {
157156
DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);

‎app/src/main/java/com/afwsamples/testdpc/policy/networking/AlwaysOnVpnFragment.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.afwsamples.testdpc.policy.networking;
1818

19-
import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
20-
2119
import android.annotation.TargetApi;
2220
import android.app.admin.DevicePolicyManager;
2321
import android.content.ComponentName;
@@ -85,7 +83,7 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup container,
8583
Bundle savedInstanceState) {
8684
final View view = super.onCreateView(layoutInflater, container, savedInstanceState);
8785

88-
if (Util.SDK_INT >= Q_VERSION_CODE) {
86+
if (Util.SDK_INT >= VERSION_CODES.Q) {
8987
final ViewGroup extension = getExtensionLayout(view);
9088
extension.setVisibility(View.VISIBLE);
9189
layoutInflater.inflate(R.layout.lockdown_settings, extension);
@@ -114,12 +112,12 @@ protected List<String> createAppList() {
114112
@Override
115113
protected void reloadSelectedPackage() {
116114
super.reloadSelectedPackage();
117-
if (Util.SDK_INT >= Q_VERSION_CODE) {
115+
if (Util.SDK_INT >= VERSION_CODES.Q) {
118116
updateLockdown();
119117
}
120118
}
121119

122-
@TargetApi(Q_VERSION_CODE)
120+
@TargetApi(VERSION_CODES.Q)
123121
private void updateLockdown() {
124122
mLockdown.setChecked(mDpm.isAlwaysOnVpnLockdownEnabled(mWho));
125123
final Set<String> exemptedPackages = mDpm.getAlwaysOnVpnLockdownWhitelist(mWho);
@@ -130,7 +128,7 @@ private void updateLockdown() {
130128
@Override
131129
protected void setSelectedPackage(String pkg) {
132130
try {
133-
if (Util.SDK_INT >= Q_VERSION_CODE) {
131+
if (Util.SDK_INT >= VERSION_CODES.Q) {
134132
setAlwaysOnVpnPackageQPlus(pkg);
135133
} else {
136134
mDpm.setAlwaysOnVpnPackage(mWho, pkg, /* lockdownEnabled */ true);
@@ -146,7 +144,7 @@ protected void setSelectedPackage(String pkg) {
146144
}
147145
}
148146

149-
@TargetApi(Q_VERSION_CODE)
147+
@TargetApi(VERSION_CODES.Q)
150148
private void setAlwaysOnVpnPackageQPlus(String pkg)
151149
throws PackageManager.NameNotFoundException {
152150
final boolean lockdown = mLockdown.isChecked();

‎app/src/main/java/com/afwsamples/testdpc/policy/networking/PrivateDnsModeFragment.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.afwsamples.testdpc.policy.networking;
1818

19-
import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
20-
2119
import android.annotation.TargetApi;
2220
import android.app.Fragment;
2321
import android.app.admin.DevicePolicyManager;
@@ -37,7 +35,7 @@
3735
import com.afwsamples.testdpc.DeviceAdminReceiver;
3836
import com.afwsamples.testdpc.R;
3937

40-
@TargetApi(Q_VERSION_CODE)
38+
@TargetApi(VERSION_CODES.Q)
4139
public class PrivateDnsModeFragment extends Fragment implements View.OnClickListener,
4240
RadioGroup.OnCheckedChangeListener {
4341
private static final String TAG = "PDNS_FRAG";

‎app/src/main/java/com/afwsamples/testdpc/policy/networking/SetPrivateDnsTask.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.afwsamples.testdpc.policy.networking;
1818

19-
import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
20-
2119
import android.annotation.TargetApi;
2220
import android.app.admin.DevicePolicyManager;
2321
import android.content.ComponentName;
@@ -27,7 +25,7 @@
2725
import com.afwsamples.testdpc.R;
2826
import com.afwsamples.testdpc.policy.keymanagement.ShowToastCallback;
2927

30-
@TargetApi(Q_VERSION_CODE)
28+
@TargetApi(VERSION_CODES.Q)
3129
final class SetPrivateDnsTask extends AsyncTask<Void, Void, String> {
3230
public static final String TAG = "Networking";
3331
private final ShowToastCallback mCallback;

0 commit comments

Comments
 (0)