Skip to content

Commit 0e8805d

Browse files
author
yuemingw
committed
Remove DpcEnforcePolicyActivity and reuse FinalizeActivity.
We can reuse FinalizeActivity directly for admin integrated flow Bug: 122721268 Test: manual Change-Id: Id638991a5c1dcfca2f22377a6ece98f6ff5abe5d
1 parent 00b3784 commit 0e8805d

File tree

2 files changed

+6
-57
lines changed

2 files changed

+6
-57
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@
7272
<activity
7373
android:name=".FinalizeActivity"
7474
android:label="@string/app_name"
75-
android:theme="@style/SuwThemeGlifV3.Light"/>
75+
android:theme="@style/SuwThemeGlifV3.Light">
76+
<intent-filter>
77+
<action android:name="android.app.action.ADMIN_POLICY_COMPLIANCE" />
78+
<category android:name="android.intent.category.DEFAULT"/>
79+
</intent-filter>
80+
</activity>
7681

7782
<activity
7883
android:name=".cosu.EnableCosuActivity"
@@ -99,14 +104,6 @@
99104
</intent-filter>
100105
</activity>
101106

102-
<activity android:name=".policy.DpcEnforcePoliciesActivity"
103-
android:exported="true">
104-
<intent-filter>
105-
<action android:name="android.app.action.ADMIN_POLICY_COMPLIANCE" />
106-
<category android:name="android.intent.category.DEFAULT"/>
107-
</intent-filter>
108-
</activity>
109-
110107
<activity
111108
android:name=".provision.ProvisioningSuccessActivity"
112109
android:theme="@android:style/Theme.NoDisplay">

app/src/main/java/com/afwsamples/testdpc/policy/DpcEnforcePoliciesActivity.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)