PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove more wrappers

Browse Source 
Bug: 76167422
Test: make RunSettingsRoboTests -j40
Change-Id: I0dc42c483ae92d508dec94e42573b55ced0e4bb0
This commit is contained in:
Fan Zhang
2018-03-30 11:33:08 -07:00
parent e645558049
commit c0c3eaa66c
19 changed files with 130 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/MobileNetworkPreferenceController.java
View File

@@ -32,7 +32,7 @@ import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.wrapper.RestrictedLockUtilsWrapper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -74,9 +74,8 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl
}
public boolean isUserRestricted() {
final RestrictedLockUtilsWrapper wrapper = new RestrictedLockUtilsWrapper();
return mIsSecondaryUser ||
wrapper.hasBaseUserRestriction(
RestrictedLockUtils.hasBaseUserRestriction(
mContext,
DISALLOW_CONFIG_MOBILE_NETWORKS,
myUserId());