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

am 0008d219: Refactor to remove multiple in-loop Object[]->String[] castings

Browse Source 
Merge commit '0008d219a2964218477d5bd5f28a848844063c44' into gingerbread-plus-aosp

* commit '0008d219a2964218477d5bd5f28a848844063c44':
  Refactor to remove multiple in-loop Object[]->String[] castings
This commit is contained in:
Ben Clark
2010-08-17 07:48:32 -07:00
committed by Android Git Automerger
parent 6ca1da8c97 0008d219a2
commit 8d62eb4a51
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/TetherSettings.java
View File

@@ -21,7 +21,6 @@ import com.android.settings.wifi.WifiApEnabler;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemProperties;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -33,8 +32,6 @@ import android.preference.CheckBoxPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.Settings;
import android.util.Log;
import android.webkit.WebView; import android.webkit.WebView;
import java.io.InputStream; import java.io.InputStream;
@@ -67,7 +64,6 @@ public class TetherSettings extends PreferenceActivity {
private BroadcastReceiver mTetherChangeReceiver; private BroadcastReceiver mTetherChangeReceiver;
private String[] mUsbRegexs; private String[] mUsbRegexs;
private ArrayList mUsbIfaces;
private String[] mWifiRegexs; private String[] mWifiRegexs;
@@ -161,7 +157,8 @@ public class TetherSettings extends PreferenceActivity {
ConnectivityManager.EXTRA_ACTIVE_TETHER); ConnectivityManager.EXTRA_ACTIVE_TETHER);
ArrayList<String> errored = intent.getStringArrayListExtra( ArrayList<String> errored = intent.getStringArrayListExtra(
ConnectivityManager.EXTRA_ERRORED_TETHER); ConnectivityManager.EXTRA_ERRORED_TETHER);
updateState(available.toArray(), active.toArray(), errored.toArray()); updateState((String[]) available.toArray(), (String[]) active.toArray(),
(String[]) errored.toArray());
} else if (intent.getAction().equals(Intent.ACTION_MEDIA_SHARED) || } else if (intent.getAction().equals(Intent.ACTION_MEDIA_SHARED) ||
intent.getAction().equals(Intent.ACTION_MEDIA_UNSHARED)) { intent.getAction().equals(Intent.ACTION_MEDIA_UNSHARED)) {
updateState(); updateState();
@@ -205,8 +202,8 @@ public class TetherSettings extends PreferenceActivity {
updateState(available, tethered, errored); updateState(available, tethered, errored);
} }
private void updateState(Object[] available, Object[] tethered, private void updateState(String[] available, String[] tethered,
Object[] errored) { String[] errored) {
ConnectivityManager cm = ConnectivityManager cm =
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE); (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
boolean usbTethered = false; boolean usbTethered = false;
@@ -215,8 +212,7 @@ public class TetherSettings extends PreferenceActivity {
boolean usbErrored = false; boolean usbErrored = false;
boolean massStorageActive = boolean massStorageActive =
Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState()); Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
for (Object o : available) { for (String s : available) {
String s = (String)o;
for (String regex : mUsbRegexs) { for (String regex : mUsbRegexs) {
if (s.matches(regex)) { if (s.matches(regex)) {
usbAvailable = true; usbAvailable = true;
@@ -226,14 +222,12 @@ public class TetherSettings extends PreferenceActivity {
} }
} }
} }
for (Object o : tethered) { for (String s : tethered) {
String s = (String)o;
for (String regex : mUsbRegexs) { for (String regex : mUsbRegexs) {
if (s.matches(regex)) usbTethered = true; if (s.matches(regex)) usbTethered = true;
} }
} }
for (Object o: errored) { for (String s: errored) {
String s = (String)o;
for (String regex : mUsbRegexs) { for (String regex : mUsbRegexs) {
if (s.matches(regex)) usbErrored = true; if (s.matches(regex)) usbErrored = true;
} }