18
18
19
19
import static android .app .admin .DevicePolicyManager .EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE ;
20
20
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 ;
21
24
22
25
import android .accounts .Account ;
23
26
import android .app .Activity ;
38
41
*/
39
42
public class DpcLoginActivity extends Activity {
40
43
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
-
48
44
private static final String LOG_TAG = "DpcLoginActivity" ;
49
45
private static final int ADD_ACCOUNT_REQUEST_CODE = 1 ;
50
46
@@ -76,7 +72,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
76
72
77
73
private Intent createResultIntentFromData (Intent data ) {
78
74
final Intent resultIntent = new Intent ();
79
- resultIntent .putExtra (EXTRA_PROVISIONING_MODE , PROVISIONING_MODE_PO );
75
+ resultIntent .putExtra (EXTRA_PROVISIONING_MODE , PROVISIONING_MODE_MANAGED_PROFILE );
80
76
if (data != null && data .hasExtra (EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE )) {
81
77
final Account accountToMigrate = data .getParcelableExtra (
82
78
EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE );
@@ -93,7 +89,7 @@ private void onNavigateNext(View nextButton) {
93
89
RadioGroup dpcLoginOptions = findViewById (R .id .dpc_login_options );
94
90
switch (dpcLoginOptions .getCheckedRadioButtonId ()) {
95
91
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 );
97
93
finishWithIntent (intent );
98
94
return ;
99
95
case R .id .dpc_login_po :
0 commit comments