Skip to content

Commit 6067579

Browse files
TreeHugger RobotAndroid (Google) Code Review
TreeHugger Robot
authored and
Android (Google) Code Review
committed
Merge "Remove TODOs and update code for Q." into ub-testdpc-qt
2 parents d17e2d5 + ae913b2 commit 6067579

File tree

7 files changed

+48
-91
lines changed

7 files changed

+48
-91
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ private static void updatePasswordConstraintNotification(Context context) {
478478
problems.add(context.getText(R.string.password_not_compliant_title));
479479
}
480480

481-
if (um.hasUserRestriction(UserRestriction.DISALLOW_UNIFIED_PASSWORD)
481+
if (um.hasUserRestriction(UserManager.DISALLOW_UNIFIED_PASSWORD)
482482
&& Util.isManagedProfileOwner(context)
483483
&& isUsingUnifiedPassword(context)) {
484484
problems.add(context.getText(R.string.separate_challenge_required_title));

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,17 +333,15 @@ private static Uri resourceToUri(Context context, int resID) {
333333
private void specifySkipUserConsent(Intent intent) {
334334
if (BuildCompat.isAtLeastO() && ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
335335
&& mSkipUserConsent.getVisibility() == View.VISIBLE) {
336-
// TODO: use action string in Android SDK
337-
intent.putExtra("android.app.extra.PROVISIONING_SKIP_USER_CONSENT",
336+
intent.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_USER_CONSENT,
338337
mSkipUserConsent.isChecked());
339338
}
340339
}
341340

342341
private void specifyKeepAccountMigrated(Intent intent) {
343342
if (BuildCompat.isAtLeastO() && ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
344343
&& mKeepAccountMigrated.getVisibility() == View.VISIBLE) {
345-
// TODO: use action string in Android SDK
346-
intent.putExtra("android.app.extra.PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION",
344+
intent.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION,
347345
mKeepAccountMigrated.isChecked());
348346
}
349347
}

‎app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ public class DpcPreferenceHelper {
9393
* not yet assigned.
9494
*/
9595
private int getDeviceSdkInt() {
96-
// TODO(b/117767701): Remove this when Q version code is finalized.
97-
if (Util.isAtLeastQ()) {
98-
return VERSION_CODES.CUR_DEVELOPMENT;
99-
}
10096
return Build.VERSION.SDK_INT;
10197
}
10298

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
648648
mInstallNonMarketAppsPreference.setCustomConstraint(
649649
() -> (mUserManager.hasUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES) ||
650650
mUserManager.hasUserRestriction(
651-
UserRestriction.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY))
651+
UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY))
652652
? R.string.user_restricted
653653
: NO_CUSTOM_CONSTRIANT);
654654
mInstallNonMarketAppsPreference.setOnPreferenceChangeListener(this);

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

Lines changed: 30 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,10 @@
3838

3939
@TargetApi(VERSION_CODES.N)
4040
public class SecurityLogsFragment extends ListFragment {
41-
4241
private static final String TAG = "ProcessLogsFragment";
4342

4443
private static final String PRE_REBOOT_KEY = "pre-reboot";
4544

46-
// TODO: remove when it lands in the SDK:
47-
private static final int TAG_OS_STARTUP = 210009;
48-
private static final int TAG_OS_SHUTDOWN = 210010;
49-
private static final int TAG_LOGGING_STARTED = 210011;
50-
private static final int TAG_LOGGING_STOPPED = 210012;
51-
private static final int TAG_MEDIA_MOUNTED = 210013;
52-
private static final int TAG_MEDIA_UNMOUNTED = 210014;
53-
private static final int TAG_LOG_BUFFER_SIZE_CRITICAL = 210015;
54-
private static final int TAG_PASSWORD_EXPIRATION_SET = 210016;
55-
private static final int TAG_PASSWORD_COMPLEXITY_SET = 210017;
56-
private static final int TAG_PASSWORD_HISTORY_LENGTH_SET = 210018;
57-
private static final int TAG_MAX_SCREEN_LOCK_TIMEOUT_SET = 210019;
58-
private static final int TAG_MAX_PASSWORD_ATTEMPTS_SET = 210020;
59-
private static final int TAG_KEYGUARD_DISABLED_FEATURES_SET = 210021;
60-
private static final int TAG_REMOTE_LOCK = 210022;
61-
private static final int TAG_WIPE_FAILED = 210023;
62-
private static final int TAG_KEY_GENERATED = 210024;
63-
private static final int TAG_KEY_IMPORTED = 210025;
64-
private static final int TAG_KEY_DESTROYED = 210026;
65-
private static final int TAG_USER_RESTRICTION_ADDED = 210027;
66-
private static final int TAG_USER_RESTRICTION_REMOVED = 210028;
67-
private static final int TAG_CERT_AUTHORITY_INSTALLED = 210029;
68-
private static final int TAG_CERT_AUTHORITY_REMOVED = 210030;
69-
private static final int TAG_CRYPTO_SELF_TEST_COMPLETED = 210031;
70-
private static final int TAG_KEY_INTEGRITY_VIOLATION = 210032;
71-
private static final int TAG_CERT_VALIDATION_FAILURE = 210033;
72-
7345
private final ArrayList<String> mLogs = new ArrayList<>();
7446
private ArrayAdapter<String> mAdapter;
7547

@@ -172,79 +144,79 @@ private String getStringEventTagFromId(int eventId) {
172144
case SecurityLog.TAG_KEYGUARD_SECURED:
173145
eventTag = "KEYGUARD_SECURED";
174146
break;
175-
case TAG_OS_STARTUP:
147+
case SecurityLog.TAG_OS_STARTUP:
176148
eventTag = "OS_STARTUP";
177149
break;
178-
case TAG_OS_SHUTDOWN:
150+
case SecurityLog.TAG_OS_SHUTDOWN:
179151
eventTag = "OS_SHUTDOWN";
180152
break;
181-
case TAG_LOGGING_STARTED:
153+
case SecurityLog.TAG_LOGGING_STARTED:
182154
eventTag = "LOGGING_STARTED";
183155
break;
184-
case TAG_LOGGING_STOPPED:
156+
case SecurityLog.TAG_LOGGING_STOPPED:
185157
eventTag = "LOGGING_STOPPED";
186158
break;
187-
case TAG_MEDIA_MOUNTED:
188-
eventTag = "MEDIA_MOUNTED";
159+
case SecurityLog.TAG_MEDIA_MOUNT:
160+
eventTag = "MEDIA_MOUNT";
189161
break;
190-
case TAG_MEDIA_UNMOUNTED:
191-
eventTag = "MEDIA_UNMOUNTED";
162+
case SecurityLog.TAG_MEDIA_UNMOUNT:
163+
eventTag = "MEDIA_UNMOUNT";
192164
break;
193-
case TAG_LOG_BUFFER_SIZE_CRITICAL:
165+
case SecurityLog.TAG_LOG_BUFFER_SIZE_CRITICAL:
194166
eventTag = "LOG_BUFFER_SIZE_CRITICAL";
195167
break;
196-
case TAG_PASSWORD_EXPIRATION_SET:
168+
case SecurityLog.TAG_PASSWORD_EXPIRATION_SET:
197169
eventTag = "PASSWORD_EXPIRATION_SET";
198170
break;
199-
case TAG_PASSWORD_COMPLEXITY_SET:
171+
case SecurityLog.TAG_PASSWORD_COMPLEXITY_SET:
200172
eventTag = "PASSWORD_COMPLEXITY_SET";
201173
break;
202-
case TAG_PASSWORD_HISTORY_LENGTH_SET:
174+
case SecurityLog.TAG_PASSWORD_HISTORY_LENGTH_SET:
203175
eventTag = "PASSWORD_HISTORY_LENGTH_SET";
204176
break;
205-
case TAG_MAX_SCREEN_LOCK_TIMEOUT_SET:
177+
case SecurityLog.TAG_MAX_SCREEN_LOCK_TIMEOUT_SET:
206178
eventTag = "MAX_SCREEN_LOCK_TIMEOUT_SET";
207179
break;
208-
case TAG_MAX_PASSWORD_ATTEMPTS_SET:
180+
case SecurityLog.TAG_MAX_PASSWORD_ATTEMPTS_SET:
209181
eventTag = "MAX_PASSWORD_ATTEMPTS_SET";
210182
break;
211-
case TAG_KEYGUARD_DISABLED_FEATURES_SET:
183+
case SecurityLog.TAG_KEYGUARD_DISABLED_FEATURES_SET:
212184
eventTag = "KEYGUARD_DISABLED_FEATURES_SET";
213185
break;
214-
case TAG_REMOTE_LOCK:
186+
case SecurityLog.TAG_REMOTE_LOCK:
215187
eventTag = "REMOTE_LOCK";
216188
break;
217-
case TAG_WIPE_FAILED:
218-
eventTag = "WIPE_FAILED";
189+
case SecurityLog.TAG_WIPE_FAILURE:
190+
eventTag = "WIPE_FAILURE";
219191
break;
220-
case TAG_KEY_GENERATED:
192+
case SecurityLog.TAG_KEY_GENERATED:
221193
eventTag = "KEY_GENERATED";
222194
break;
223-
case TAG_KEY_IMPORTED:
224-
eventTag = "KEY_IMPORTED";
195+
case SecurityLog.TAG_KEY_IMPORT:
196+
eventTag = "KEY_IMPORT";
225197
break;
226-
case TAG_KEY_DESTROYED:
227-
eventTag = "KEY_DESTROYED";
198+
case SecurityLog.TAG_KEY_DESTRUCTION:
199+
eventTag = "KEY_DESTRUCTION";
228200
break;
229-
case TAG_USER_RESTRICTION_ADDED:
201+
case SecurityLog.TAG_USER_RESTRICTION_ADDED:
230202
eventTag = "USER_RESTRICTION_ADDED";
231203
break;
232-
case TAG_USER_RESTRICTION_REMOVED:
204+
case SecurityLog.TAG_USER_RESTRICTION_REMOVED:
233205
eventTag = "USER_RESTRICTION_REMOVED";
234206
break;
235-
case TAG_CERT_AUTHORITY_INSTALLED:
207+
case SecurityLog.TAG_CERT_AUTHORITY_INSTALLED:
236208
eventTag = "CERT_AUTHORITY_INSTALLED";
237209
break;
238-
case TAG_CERT_AUTHORITY_REMOVED:
210+
case SecurityLog.TAG_CERT_AUTHORITY_REMOVED:
239211
eventTag = "CERT_AUTHORITY_REMOVED";
240212
break;
241-
case TAG_CRYPTO_SELF_TEST_COMPLETED:
213+
case SecurityLog.TAG_CRYPTO_SELF_TEST_COMPLETED:
242214
eventTag = "CRYPTO_SELF_TEST_COMPLETED";
243215
break;
244-
case TAG_KEY_INTEGRITY_VIOLATION:
216+
case SecurityLog.TAG_KEY_INTEGRITY_VIOLATION:
245217
eventTag = "KEY_INTEGRITY_VIOLATION";
246218
break;
247-
case TAG_CERT_VALIDATION_FAILURE:
219+
case SecurityLog.TAG_CERT_VALIDATION_FAILURE:
248220
eventTag = "CERT_VALIDATION_FAILURE";
249221
break;
250222
default:

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

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@
44
import static android.os.UserManager.DISALLOW_ADD_MANAGED_PROFILE;
55
import static android.os.UserManager.DISALLOW_ADD_USER;
66
import static android.os.UserManager.DISALLOW_ADJUST_VOLUME;
7+
import static android.os.UserManager.DISALLOW_AIRPLANE_MODE;
8+
import static android.os.UserManager.DISALLOW_AMBIENT_DISPLAY;
79
import static android.os.UserManager.DISALLOW_APPS_CONTROL;
810
import static android.os.UserManager.DISALLOW_AUTOFILL;
911
import static android.os.UserManager.DISALLOW_BLUETOOTH;
1012
import static android.os.UserManager.DISALLOW_BLUETOOTH_SHARING;
1113
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
14+
import static android.os.UserManager.DISALLOW_CONFIG_BRIGHTNESS;
1215
import static android.os.UserManager.DISALLOW_CONFIG_CELL_BROADCASTS;
1316
import static android.os.UserManager.DISALLOW_CONFIG_CREDENTIALS;
1417
import static android.os.UserManager.DISALLOW_CONFIG_DATE_TIME;
15-
import static android.os.UserManager.DISALLOW_AIRPLANE_MODE;
16-
import static android.os.UserManager.DISALLOW_CONFIG_BRIGHTNESS;
17-
import static android.os.UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT;
18-
import static android.os.UserManager.DISALLOW_AMBIENT_DISPLAY;
18+
import static android.os.UserManager.DISALLOW_CONFIG_LOCATION;
1919
import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
20+
import static android.os.UserManager.DISALLOW_CONFIG_PRIVATE_DNS;
21+
import static android.os.UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT;
2022
import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
2123
import static android.os.UserManager.DISALLOW_CONFIG_VPN;
2224
import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
@@ -28,18 +30,23 @@
2830
import static android.os.UserManager.DISALLOW_FUN;
2931
import static android.os.UserManager.DISALLOW_INSTALL_APPS;
3032
import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
33+
import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
3134
import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;
3235
import static android.os.UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA;
3336
import static android.os.UserManager.DISALLOW_NETWORK_RESET;
3437
import static android.os.UserManager.DISALLOW_OUTGOING_BEAM;
3538
import static android.os.UserManager.DISALLOW_OUTGOING_CALLS;
39+
import static android.os.UserManager.DISALLOW_PRINTING;
3640
import static android.os.UserManager.DISALLOW_REMOVE_MANAGED_PROFILE;
3741
import static android.os.UserManager.DISALLOW_REMOVE_USER;
3842
import static android.os.UserManager.DISALLOW_SAFE_BOOT;
3943
import static android.os.UserManager.DISALLOW_SET_USER_ICON;
4044
import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
45+
import static android.os.UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE;
4146
import static android.os.UserManager.DISALLOW_SHARE_LOCATION;
4247
import static android.os.UserManager.DISALLOW_SMS;
48+
import static android.os.UserManager.DISALLOW_SYSTEM_ERROR_DIALOGS;
49+
import static android.os.UserManager.DISALLOW_UNIFIED_PASSWORD;
4350
import static android.os.UserManager.DISALLOW_UNINSTALL_APPS;
4451
import static android.os.UserManager.DISALLOW_UNMUTE_MICROPHONE;
4552
import static android.os.UserManager.DISALLOW_USB_FILE_TRANSFER;
@@ -49,15 +56,6 @@
4956
import com.afwsamples.testdpc.R;
5057

5158
public class UserRestriction {
52-
// TODO: remove it once available in SDK
53-
public static final String DISALLOW_UNIFIED_PASSWORD = "no_unified_password";
54-
public static final String DISALLOW_CONFIG_LOCATION = "no_config_location";
55-
public static final String DISALLOW_PRINTING= "no_printing";
56-
public static final String DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY =
57-
"no_install_unknown_sources_globally";
58-
public static final String DISALLOW_CONFIG_PRIVATE_DNS =
59-
"disallow_config_private_dns";
60-
6159
public String key;
6260
public int titleResId;
6361

@@ -66,12 +64,6 @@ public UserRestriction(String key, int titleResId) {
6664
this.titleResId = titleResId;
6765
}
6866

69-
// TODO(68687253): Replace this hard-coded string with UserManager.DISALLOW_SYSTEM_ERROR_DIALOGS
70-
private static final String DISALLOW_SYSTEM_ERROR_DIALOGS = "no_system_error_dialogs";
71-
72-
//TODO: Replace with UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE
73-
private static final String DISALLOW_SHARE_INTO_MANAGED_PROFILE = "no_sharing_into_profile";
74-
7567
public static final UserRestriction[] ALL_USER_RESTRICTIONS = {
7668
new UserRestriction(
7769
ALLOW_PARENT_PROFILE_APP_LINKING,

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
9898
} else {
9999
mDevicePolicyManager.clearUserRestriction(mAdminComponentName, restriction);
100100
if (DISALLOW_INSTALL_UNKNOWN_SOURCES.equals(restriction) ||
101-
UserRestriction.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY.equals(
101+
UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY.equals(
102102
restriction)) {
103103
new AlertDialog.Builder(getActivity())
104104
.setMessage(R.string.check_setting_disallow_install_unknown_sources)
@@ -107,7 +107,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
107107
}
108108
}
109109
updateUserRestriction(restriction);
110-
if (UserRestriction.DISALLOW_UNIFIED_PASSWORD.equals(restriction)) {
110+
if (UserManager.DISALLOW_UNIFIED_PASSWORD.equals(restriction)) {
111111
DeviceAdminReceiver.sendPasswordRequirementsChanged(getActivity());
112112
}
113113
return true;
@@ -150,8 +150,7 @@ private void constrainPreferences() {
150150
}
151151
for (String restriction: UserRestriction.QT_PLUS_RESTRICTIONS) {
152152
DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
153-
// Replace this with Q when available
154-
pref.setMinSdkVersion(VERSION_CODES.CUR_DEVELOPMENT);
153+
pref.setMinSdkVersion(VERSION_CODES.Q);
155154
}
156155
for (String restriction : UserRestriction.PRIMARY_USER_ONLY_RESTRICTIONS) {
157156
DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);

0 commit comments

Comments
 (0)