Apply admin restriction when network reset is disallowed

- Refactored network restriction checking logic into a checker class to
share across different places
- Added test

Test: make RunSettingsRoboTests
Change-Id: I6b7ea78f28fd1b61aacb070c377821150e441a74
Fix: 37134598
This commit is contained in:
Fan Zhang
2017-04-13 18:03:45 -07:00
parent c4f08120b1
commit 5ca9063bc2
5 changed files with 158 additions and 19 deletions

View File

@@ -0,0 +1,53 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import com.android.settingslib.RestrictedLockUtils;
public class NetworkResetRestrictionChecker {
private final Context mContext;
private final UserManager mUserManager;
public NetworkResetRestrictionChecker(Context context) {
mContext = context;
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
}
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
boolean hasUserBaseRestriction() {
return RestrictedLockUtils.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
}
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
boolean isRestrictionEnforcedByAdmin() {
return RestrictedLockUtils.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId()) != null;
}
boolean hasRestriction() {
return !mUserManager.isAdminUser()
|| hasUserBaseRestriction()
|| isRestrictionEnforcedByAdmin();
}
}