Skip to content

Commit e6f1bac

Browse files
TreeHugger RobotAndroid (Google) Code Review
authored andcommitted
Merge "Check if app is PO before calling isEnterpriseNetworkPreferenceEnabled()" into ub-testdpc-sc
2 parents b918060 + 31e16cd commit e6f1bac

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
528528

529529
private Uri mImageUri;
530530
private Uri mVideoUri;
531+
private boolean mIsProfileOwner;
531532

532533
@Override
533534
public void onCreate(Bundle savedInstanceState) {
@@ -542,6 +543,7 @@ public void onCreate(Bundle savedInstanceState) {
542543
mPackageManager = getActivity().getPackageManager();
543544
mDevicePolicyManagerGateway = new DevicePolicyManagerGatewayImpl(mDevicePolicyManager,
544545
mUserManager, mPackageManager, mAdminComponentName);
546+
mIsProfileOwner = mDevicePolicyManagerGateway.isProfileOwnerApp();
545547
mTelephonyManager = (TelephonyManager) getActivity()
546548
.getSystemService(Context.TELEPHONY_SERVICE);
547549
mAccountManager = AccountManager.get(getActivity());
@@ -606,9 +608,10 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
606608
mEnterpriseNetworkPreferenceSwitchPreference = (SwitchPreference) findPreference(
607609
SET_GET_NETWORK_PREFERENCE_STATUS);
608610
mEnterpriseNetworkPreferenceSwitchPreference.setOnPreferenceChangeListener(this);
609-
mEnterpriseNetworkPreferenceSwitchPreference.setChecked(
610-
mDevicePolicyManager.isEnterpriseNetworkPreferenceEnabled());
611-
611+
if (mIsProfileOwner) {
612+
mEnterpriseNetworkPreferenceSwitchPreference.setChecked(
613+
mDevicePolicyManager.isEnterpriseNetworkPreferenceEnabled());
614+
}
612615
findPreference(LOCK_SCREEN_POLICY_KEY).setOnPreferenceClickListener(this);
613616
findPreference(PASSWORD_CONSTRAINTS_KEY).setOnPreferenceClickListener(this);
614617
findPreference(RESET_PASSWORD_KEY).setOnPreferenceClickListener(this);

0 commit comments

Comments
 (0)