Skip to content

Commit 1890f78

Browse files
author
arangelov
committed
Use the new DevicePolicyManager provisioning mode constants.
Fixes: 129138082 Bug: 129135684 Test: none Change-Id: Iafbf985131793c084d02bfd71719d0130daafead
1 parent c5bedc4 commit 1890f78

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

app/src/main/java/com/afwsamples/testdpc/provision/DpcLoginActivity.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
2020
import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
21+
import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_MODE;
22+
import static android.app.admin.DevicePolicyManager.PROVISIONING_MODE_FULLY_MANAGED_DEVICE;
23+
import static android.app.admin.DevicePolicyManager.PROVISIONING_MODE_MANAGED_PROFILE;
2124

2225
import android.accounts.Account;
2326
import android.app.Activity;
@@ -38,13 +41,6 @@
3841
*/
3942
public class DpcLoginActivity extends Activity {
4043

41-
// TODO: clean up these hard coded constants once the new SDK is available.
42-
private static final String EXTRA_PROVISIONING_MODE =
43-
"android.app.extra.PROVISIONING_MODE";
44-
public static final int PROVISIONING_MODE_DO = 1;
45-
public static final int PROVISIONING_MODE_PO = 2;
46-
public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3;
47-
4844
private static final String LOG_TAG = "DpcLoginActivity";
4945
private static final int ADD_ACCOUNT_REQUEST_CODE = 1;
5046

@@ -76,7 +72,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
7672

7773
private Intent createResultIntentFromData(Intent data) {
7874
final Intent resultIntent = new Intent();
79-
resultIntent.putExtra(EXTRA_PROVISIONING_MODE, PROVISIONING_MODE_PO);
75+
resultIntent.putExtra(EXTRA_PROVISIONING_MODE, PROVISIONING_MODE_MANAGED_PROFILE);
8076
if (data != null && data.hasExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE)) {
8177
final Account accountToMigrate = data.getParcelableExtra(
8278
EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE);
@@ -93,7 +89,7 @@ private void onNavigateNext(View nextButton) {
9389
RadioGroup dpcLoginOptions = findViewById(R.id.dpc_login_options);
9490
switch (dpcLoginOptions.getCheckedRadioButtonId()) {
9591
case R.id.dpc_login_do:
96-
intent.putExtra(EXTRA_PROVISIONING_MODE, PROVISIONING_MODE_DO);
92+
intent.putExtra(EXTRA_PROVISIONING_MODE, PROVISIONING_MODE_FULLY_MANAGED_DEVICE);
9793
finishWithIntent(intent);
9894
return;
9995
case R.id.dpc_login_po:

0 commit comments

Comments
 (0)