Skip to content

Commit ec2b1e7

Browse files
author
yuemingw
committed
Don't launch FinishActivity and AddAccountActivity when
receiving provisioning completed broadcast. Test: manual Bug: 122721268 Change-Id: I1f1f3244505f9b5e2112bbd29446638b9df22438
1 parent d6845f0 commit ec2b1e7

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<activity android:name=".policy.DpcEnforcePoliciesActivity"
103103
android:exported="true">
104104
<intent-filter>
105-
<action android:name="android.app.action.DPC_POLICY_COMPLIANCE" />
105+
<action android:name="android.app.action.ADMIN_POLICY_COMPLIANCE" />
106106
<category android:name="android.intent.category.DEFAULT"/>
107107
</intent-filter>
108108
</activity>

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616

1717
package com.afwsamples.testdpc;
1818

19-
import static com.afwsamples.testdpc.policy.PolicyManagementFragment.OVERRIDE_KEY_SELECTION_KEY;
20-
2119
import android.annotation.TargetApi;
2220
import android.app.NotificationManager;
2321
import android.app.PendingIntent;
2422
import android.app.admin.DevicePolicyManager;
25-
import android.app.admin.NetworkEvent;
2623
import android.content.ComponentName;
2724
import android.content.Context;
2825
import android.content.Intent;
@@ -35,10 +32,8 @@
3532
import android.os.Process;
3633
import android.os.UserHandle;
3734
import android.os.UserManager;
38-
import android.preference.PreferenceManager;
3935
import android.support.v4.app.NotificationCompat;
4036
import android.support.v4.os.BuildCompat;
41-
import android.text.TextUtils;
4237
import android.util.Log;
4338
import android.widget.Toast;
4439
import com.afwsamples.testdpc.common.NotificationUtil;
@@ -60,7 +55,6 @@
6055
import java.util.ArrayList;
6156
import java.util.Collections;
6257
import java.util.Date;
63-
import java.util.List;
6458

6559
/**
6660
* Handles events related to the managed profile.
@@ -127,16 +121,6 @@ public void onProfileProvisioningComplete(Context context, Intent intent) {
127121
if (!task.performPostProvisioningOperations(intent)) {
128122
return;
129123
}
130-
131-
Intent launchIntent = task.getPostProvisioningLaunchIntent(intent);
132-
if (launchIntent != null) {
133-
context.startActivity(launchIntent);
134-
} else {
135-
Log.e(TAG, "DeviceAdminReceiver.onProvisioningComplete() invoked, but ownership "
136-
+ "not assigned");
137-
Toast.makeText(context, R.string.device_admin_receiver_failure, Toast.LENGTH_LONG)
138-
.show();
139-
}
140124
}
141125

142126
@TargetApi(Build.VERSION_CODES.N)

0 commit comments

Comments
 (0)