diff options
| author | Stephen Bird <sbird@cyngn.com> | 2015-07-20 11:36:40 -0700 |
|---|---|---|
| committer | Stephen Bird <sbird@cyngn.com> | 2015-07-20 11:36:40 -0700 |
| commit | 21e20d2fac2c96ec9508f286a1968c445ce0f971 (patch) | |
| tree | 354523e7de37cbf3368e5861d1e74f23e0a2ff7e | |
| parent | faaee32d9918bb0bb286b1c0f0a3d6ab8a1656d6 (diff) | |
| download | android_frameworks_base-caf/cm-12.0.tar.gz android_frameworks_base-caf/cm-12.0.tar.bz2 android_frameworks_base-caf/cm-12.0.zip | |
Revert "Data Toggle: Bring inline with mainline cyanogen settings"caf/cm-12.0
This reverts commit faaee32d9918bb0bb286b1c0f0a3d6ab8a1656d6.
Change-Id: I0fdcba38140c2489bebbfb4d14e9f4e670ccc5a2
| -rw-r--r-- | core/java/android/app/ConnectionSettings.java | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/core/java/android/app/ConnectionSettings.java b/core/java/android/app/ConnectionSettings.java index 10f10ae771c..f8c19253485 100644 --- a/core/java/android/app/ConnectionSettings.java +++ b/core/java/android/app/ConnectionSettings.java @@ -27,9 +27,6 @@ import android.nfc.NfcAdapter; import android.os.Parcel; import android.os.Parcelable; import android.provider.Settings; -import android.telephony.SubscriptionManager; -import android.telephony.TelephonyManager; - import com.android.internal.telephony.RILConstants; import org.xmlpull.v1.XmlPullParser; @@ -124,8 +121,7 @@ public final class ConnectionSettings implements Parcelable { BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter(); LocationManager lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - TelephonyManager tm = (TelephonyManager) - context.getSystemService(Context.TELEPHONY_SERVICE); + ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NfcAdapter nfcAdapter = null; try { nfcAdapter = NfcAdapter.getNfcAdapter(context); @@ -138,15 +134,9 @@ public final class ConnectionSettings implements Parcelable { switch (getConnectionId()) { case PROFILE_CONNECTION_MOBILEDATA: - currentState = tm.getDataEnabled(); + currentState = cm.getMobileDataEnabled(); if (forcedState != currentState) { - int phoneCount = tm.getPhoneCount(); - for (int i = 0; i < phoneCount; i++) { - Settings.Global.putInt(context.getContentResolver(), - Settings.Global.MOBILE_DATA + i, (forcedState) ? 1 : 0); - int[] subId = SubscriptionManager.getSubId(i); - tm.setDataEnabled(subId[0], forcedState); - } +// hharte cm.setMobileDataEnabled(forcedState); } break; case PROFILE_CONNECTION_2G3G4G: |