diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-08-28 15:01:43 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-08-30 08:11:39 -0700 |
| commit | e3f721132a379799af10c8a8fc11db923f298af8 (patch) | |
| tree | a1879e362bff8c63ad4864db752c829e9e87ecd0 /src/com/android/settings/nfc/AndroidBeam.java | |
| parent | a59ce66b3beaec79c662d472467c73f6eaa90306 (diff) | |
| download | packages_apps_Settings-e3f721132a379799af10c8a8fc11db923f298af8.tar.gz packages_apps_Settings-e3f721132a379799af10c8a8fc11db923f298af8.tar.bz2 packages_apps_Settings-e3f721132a379799af10c8a8fc11db923f298af8.zip | |
RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.
This causes a lot of trivial code changes.
I also updated the ordering of the imports in all affected files.
Bug: 110953302
Test: Built
make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
Diffstat (limited to 'src/com/android/settings/nfc/AndroidBeam.java')
| -rw-r--r-- | src/com/android/settings/nfc/AndroidBeam.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index efa6041855..2b7f872c0c 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -38,7 +38,7 @@ import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.widget.SwitchBar; import com.android.settingslib.HelpUtils; -import com.android.settingslib.RestrictedLockUtils; +import com.android.settingslib.RestrictedLockUtilsInternal; public class AndroidBeam extends InstrumentedFragment implements SwitchBar.OnSwitchChangeListener { @@ -68,10 +68,10 @@ public class AndroidBeam extends InstrumentedFragment @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced( + final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced( getActivity(), UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId()); final UserManager um = UserManager.get(getActivity()); - mBeamDisallowedByBase = RestrictedLockUtils.hasBaseUserRestriction(getActivity(), + mBeamDisallowedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(), UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId()); if (!mBeamDisallowedByBase && admin != null) { new ActionDisabledByAdminDialogHelper(getActivity()) |