summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/TetherSettings.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-11-13 18:02:31 -0800
committerJeff Sharkey <jsharkey@android.com>2014-11-14 09:46:33 -0800
commite16e44f7568d015b29b01acde01551854c9a1c5d (patch)
tree0a45b0900ceb7ad2e1c02b07542a4c6a1208f77c /src/com/android/settings/TetherSettings.java
parent6416bec01de67492ac761ba84c8b86c59e4dee28 (diff)
downloadpackages_apps_Settings-e16e44f7568d015b29b01acde01551854c9a1c5d.zip
packages_apps_Settings-e16e44f7568d015b29b01acde01551854c9a1c5d.tar.gz
packages_apps_Settings-e16e44f7568d015b29b01acde01551854c9a1c5d.tar.bz2
Migrate license display to HTMLViewer.
For security purposes, we're no longer allowing WebView to be loaded when running as system UID. Instead, we now launch HTMLViewer to show the details. Bug: 18376908 Change-Id: I3c6a7897ab4ad0fc2c5463e5d69c7f53fb934e31
Diffstat (limited to 'src/com/android/settings/TetherSettings.java')
-rw-r--r--src/com/android/settings/TetherSettings.java17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index c611772..230bbb2 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -16,11 +16,7 @@
package com.android.settings;
-import com.android.settings.wifi.WifiApEnabler;
-import com.android.settings.wifi.WifiApDialog;
-
import android.app.Activity;
-import android.app.AlertDialog;
import android.app.Dialog;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
@@ -31,7 +27,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager;
import android.net.wifi.WifiConfiguration;
@@ -44,16 +39,13 @@ import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.preference.SwitchPreference;
-import android.text.TextUtils;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.webkit.WebView;
import android.widget.TextView;
-import java.io.InputStream;
+import com.android.settings.wifi.WifiApDialog;
+import com.android.settings.wifi.WifiApEnabler;
+
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.Locale;
/*
* Displays preferences for Tethering.
@@ -69,7 +61,6 @@ public class TetherSettings extends SettingsPreferenceFragment
private static final int DIALOG_AP_SETTINGS = 1;
- private WebView mView;
private SwitchPreference mUsbTether;
private WifiApEnabler mWifiApEnabler;
@@ -182,8 +173,6 @@ public class TetherSettings extends SettingsPreferenceFragment
mProvisionApp = getResources().getStringArray(
com.android.internal.R.array.config_mobile_hotspot_provision_app);
-
- mView = new WebView(activity);
}
@Override