Merge "Fix build" into nyc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 694b570..14bcd0e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1481,9 +1481,6 @@
<!-- Link speed on Wifi Status screen -->
<string name="link_speed">%1$d Mbps</string>
- <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
- <string name="wifi_alert_lockdown_by_device_owner"><xliff:g id="app_name">%1$s</xliff:g> manages your device and doesn\u2019t allow modifying or deleting this Wi-Fi network. For more information, contact your administrator.</string>
-
<!-- NFC settings -->
<!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string>
@@ -1791,6 +1788,8 @@
<string name="wifi_saved_access_points_label">Saved networks</string>
<!-- Wifi Advanced settings. Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
<string name="wifi_advanced_settings_label">IP settings</string>
+ <!-- Error message for users that aren't allowed to see or modify WiFi advanced settings [CHAR LIMIT=NONE] -->
+ <string name="wifi_advanced_not_available">Wi\u2011Fi advanced settings are not available for this user</string>
<!-- Menu item to save the IP settings -->
<string name="wifi_ip_settings_menu_save">Save</string>
<!-- Menu ietm to cancel the IP settings -->
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 1b4dc1a..439a7d9 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -60,7 +60,7 @@
import java.util.ArrayList;
-public class ApnSettings extends SettingsPreferenceFragment implements
+public class ApnSettings extends RestrictedSettingsFragment implements
Preference.OnPreferenceChangeListener {
static final String TAG = "ApnSettings";
@@ -103,8 +103,6 @@
private String mMvnoType;
private String mMvnoMatchData;
- private UserManager mUm;
-
private String mSelectedKey;
private IntentFilter mMobileStateFilter;
@@ -114,6 +112,10 @@
private boolean mHideImsApn;
private boolean mAllowAddingApns;
+ public ApnSettings() {
+ super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
+ }
+
private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -154,14 +156,10 @@
final int subId = activity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
- mUm = (UserManager) getSystemService(Context.USER_SERVICE);
-
mMobileStateFilter = new IntentFilter(
TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
- if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
- setHasOptionsMenu(true);
- }
+ setIfOnlyAvailableForAdmins(true);
mSubscriptionInfo = SubscriptionManager.from(activity).getActiveSubscriptionInfo(subId);
mUiccController = UiccController.getInstance();
@@ -177,16 +175,12 @@
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- TextView empty = (TextView) getView().findViewById(android.R.id.empty);
- if (empty != null) {
- empty.setText(R.string.apn_settings_not_available);
- setEmptyView(empty);
- }
-
- if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)
- || !mUm.isAdminUser()) {
- mUnavailable = true;
+ getEmptyTextView().setText(R.string.apn_settings_not_available);
+ mUnavailable = isUiRestricted();
+ setHasOptionsMenu(!mUnavailable);
+ if (mUnavailable) {
setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
+ getPreferenceScreen().removeAll();
return;
}
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index ef874f5..a1be553 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.Bundle;
+import android.os.UserHandle;
import android.os.UserManager;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -33,7 +34,11 @@
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
+import com.android.settings.ShowAdminSupportDetailsDialog;
import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.RestrictedLockUtils;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
public class AndroidBeam extends InstrumentedFragment
implements SwitchBar.OnSwitchChangeListener {
@@ -41,7 +46,8 @@
private NfcAdapter mNfcAdapter;
private SwitchBar mSwitchBar;
private CharSequence mOldActivityTitle;
- private boolean mBeamDisallowed;
+ private boolean mBeamDisallowedByBase;
+ private boolean mBeamDisallowedByAdmin;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -53,8 +59,6 @@
actionBar.setTitle(R.string.android_beam_settings_title);
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
- mBeamDisallowed = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
- .hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
setHasOptionsMenu(true);
}
@@ -68,8 +72,19 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
+ final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ getActivity(), UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
+ final UserManager um = UserManager.get(getActivity());
+ mBeamDisallowedByBase = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+ UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
+ if (!mBeamDisallowedByBase && admin != null) {
+ View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
+ ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false);
+ view.setVisibility(View.VISIBLE);
+ mBeamDisallowedByAdmin = true;
+ return view;
+ }
mView = inflater.inflate(R.layout.android_beam, container, false);
-
return mView;
}
@@ -80,10 +95,14 @@
SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
- mSwitchBar.setChecked(!mBeamDisallowed && mNfcAdapter.isNdefPushEnabled());
- mSwitchBar.addOnSwitchChangeListener(this);
- mSwitchBar.setEnabled(!mBeamDisallowed);
- mSwitchBar.show();
+ if (!mBeamDisallowedByBase && mBeamDisallowedByAdmin) {
+ mSwitchBar.hide();
+ } else {
+ mSwitchBar.setChecked(!mBeamDisallowedByBase && mNfcAdapter.isNdefPushEnabled());
+ mSwitchBar.addOnSwitchChangeListener(this);
+ mSwitchBar.setEnabled(!mBeamDisallowedByBase);
+ mSwitchBar.show();
+ }
}
@Override
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 1f24018..47f8ff9 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -28,12 +28,11 @@
import android.widget.ImageView;
import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
import java.util.Comparator;
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
public class UserPreference extends RestrictedPreference {
private static final int ALPHA_ENABLED = 255;
private static final int ALPHA_DISABLED = 102;
@@ -103,7 +102,8 @@
View deleteView = view.findViewById(R.id.trash_user);
if (deleteView != null) {
if (mDeleteClickListener != null
- && !um.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) {
+ && !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
+ UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
deleteView.setOnClickListener(mDeleteClickListener);
deleteView.setTag(this);
} else {
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 1c0260f..2163245 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -970,7 +970,15 @@
int userId = ((UserPreference) v.getTag()).getUserId();
switch (v.getId()) {
case UserPreference.DELETE_ID:
- onRemoveUserClicked(userId);
+ final EnforcedAdmin removeDisallowedAdmin =
+ RestrictedLockUtils.checkIfRestrictionEnforced(getContext(),
+ UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
+ if (removeDisallowedAdmin != null) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+ removeDisallowedAdmin);
+ } else {
+ onRemoveUserClicked(userId);
+ }
break;
case UserPreference.SETTINGS_ID:
onManageUserClicked(userId, false);
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index fd81fef..6f23b4f 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -22,14 +22,18 @@
import android.content.Intent;
import android.net.wifi.WpsInfo;
import android.os.Bundle;
+import android.os.UserManager;
import android.security.Credentials;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
+import android.support.v7.preference.PreferenceScreen;
+
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settingslib.RestrictedLockUtils;
-public class AdvancedWifiSettings extends SettingsPreferenceFragment {
+public class AdvancedWifiSettings extends RestrictedSettingsFragment {
private static final String TAG = "AdvancedWifiSettings";
private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
@@ -37,6 +41,12 @@
private static final String KEY_WPS_PUSH = "wps_push_button";
private static final String KEY_WPS_PIN = "wps_pin_entry";
+ private boolean mUnavailable;
+
+ public AdvancedWifiSettings() {
+ super(UserManager.DISALLOW_CONFIG_WIFI);
+ }
+
@Override
protected int getMetricsCategory() {
return MetricsEvent.WIFI_ADVANCED;
@@ -45,13 +55,29 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.wifi_advanced_settings);
+ if (isUiRestricted()) {
+ mUnavailable = true;
+ setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
+ } else {
+ addPreferencesFromResource(R.xml.wifi_advanced_settings);
+ }
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ getEmptyTextView().setText(R.string.wifi_advanced_not_available);
+ if (mUnavailable) {
+ getPreferenceScreen().removeAll();
+ }
}
@Override
public void onResume() {
super.onResume();
- initPreferences();
+ if (!mUnavailable) {
+ initPreferences();
+ }
}
private void initPreferences() {
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index c85ae2e..20faeb0 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -143,12 +143,8 @@
}
mSelectedAccessPoint = mDlgAccessPoint;
- // Hide forget button if config editing is locked down
- final boolean hideForgetButton = WifiSettings.isEditabilityLockedDown(getActivity(),
- mDlgAccessPoint.getConfig());
mDialog = new WifiDialog(getActivity(), this, mDlgAccessPoint,
- WifiConfigUiBase.MODE_VIEW, true /* hide the submit button */,
- hideForgetButton);
+ WifiConfigUiBase.MODE_VIEW, true /* hide the submit button */);
return mDialog;
}
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index 9b8fd7a..f72b4f0 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -24,6 +24,7 @@
import android.widget.Button;
import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.wifi.AccessPoint;
class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener {
@@ -43,13 +44,11 @@
private View mView;
private WifiConfigController mController;
private boolean mHideSubmitButton;
- private boolean mHideForgetButton;
public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
- int mode, boolean hideSubmitButton, boolean hideForgetButton) {
+ int mode, boolean hideSubmitButton) {
this(context, listener, accessPoint, mode);
mHideSubmitButton = hideSubmitButton;
- mHideForgetButton = hideForgetButton;
}
public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
@@ -59,7 +58,6 @@
mListener = listener;
mAccessPoint = accessPoint;
mHideSubmitButton = false;
- mHideForgetButton = false;
}
@Override
@@ -83,7 +81,7 @@
mController.enableSubmitIfAppropriate();
}
- if (mHideForgetButton) {
+ if (mAccessPoint == null) {
mController.hideForgetButton();
}
}
@@ -109,6 +107,12 @@
mListener.onSubmit(this);
break;
case BUTTON_FORGET:
+ if (WifiSettings.isEditabilityLockedDown(
+ getContext(), mAccessPoint.getConfig())) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+ RestrictedLockUtils.getDeviceOwner(getContext()));
+ return;
+ }
mListener.onForget(this);
break;
}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 5541c2d..17cc3b6 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -17,8 +17,6 @@
package com.android.settings.wifi;
import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AppGlobals;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
@@ -27,8 +25,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
@@ -74,6 +70,7 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
import com.android.settingslib.wifi.AccessPointPreference;
@@ -541,26 +538,8 @@
if (accessPoint != null) {
WifiConfiguration config = accessPoint.getConfig();
if (isEditabilityLockedDown(getActivity(), config) && accessPoint.isActive()) {
- final int userId = UserHandle.getUserId(config.creatorUid);
- final PackageManager pm = getActivity().getPackageManager();
- final IPackageManager ipm = AppGlobals.getPackageManager();
- String appName = pm.getNameForUid(config.creatorUid);
- try {
- final ApplicationInfo appInfo = ipm.getApplicationInfo(appName, /* flags */ 0,
- userId);
- final CharSequence label = pm.getApplicationLabel(appInfo);
- if (label != null) {
- appName = label.toString();
- }
- } catch (RemoteException e) {
- // leave appName as packageName
- }
- final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
- builder.setTitle(accessPoint.getSsid())
- .setMessage(getString(R.string.wifi_alert_lockdown_by_device_owner,
- appName))
- .setPositiveButton(android.R.string.ok, null)
- .show();
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
+ RestrictedLockUtils.getDeviceOwner(getActivity()));
return;
}
}
@@ -593,11 +572,8 @@
}
// If it's null, fine, it's for Add Network
mSelectedAccessPoint = ap;
- final boolean hideForget = (ap == null || isEditabilityLockedDown(getActivity(),
- ap.getConfig()));
mDialog = new WifiDialog(getActivity(), this, ap, mDialogMode,
- /* no hide submit/connect */ false,
- /* hide forget if config locked down */ hideForget);
+ /* no hide submit/connect */ false);
return mDialog;
case WPS_PBC_DIALOG_ID:
return new WpsDialog(getActivity(), WpsInfo.PBC);