Skip to content

Commit a5a011b

Browse files
Rubin XuAndrewScull
authored andcommitted
Initialize parent instance of DevicePolicyManager earlier
Otherwise in the onCreatePreferences() method of the subclass, it will get the incorrect DevicePolicyManager instance. Bug: 30030055 Change-Id: Ie54dbc38b3767dedf94f1ce393a191c9a567fe62 (cherry picked from commit 4a91d63181220e6de606c8480bc3ed20d4043e0c)
1 parent 800e2f7 commit a5a011b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

app/src/main/java/com/afwsamples/testdpc/common/ProfileOrParentFragment.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ public void onCreate(Bundle savedInstanceState) {
169169
mProfileOwner = mDevicePolicyManager.isProfileOwnerApp(getActivity().getPackageName());
170170
mDeviceOwner = mDevicePolicyManager.isDeviceOwnerApp(getActivity().getPackageName());
171171

172+
if (mParentInstance) {
173+
mDevicePolicyManager = mDevicePolicyManager.getParentProfileInstance(mAdminComponent);
174+
}
175+
172176
// Put at last to make sure all initializations above are done before subclass's
173177
// onCreatePreferences is called.
174178
super.onCreate(savedInstanceState);
@@ -177,7 +181,6 @@ public void onCreate(Bundle savedInstanceState) {
177181
// This needs to be called after super.onCreate because preference manager is set up
178182
// inside super.onCreate.
179183
if (mParentInstance) {
180-
mDevicePolicyManager = mDevicePolicyManager.getParentProfileInstance(mAdminComponent);
181184
final PreferenceManager pm = getPreferenceManager();
182185
pm.setSharedPreferencesName(pm.getSharedPreferencesName() + TAG_PARENT);
183186
}

0 commit comments

Comments
 (0)