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

[RadioInfo] Save PreferredNetworkMode to Settings am: daea8be9ab

Browse Source 
am: 1701aaf186

Change-Id: Ic2e685fa8076d0ac1255d3bf61b49c70f1d1767f
This commit is contained in:
Nathan Harold
2018-06-06 19:36:03 -07:00
committed by android-build-merger
parent c0cadf4f80 1701aaf186
commit a927f53f3d
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/RadioInfo.java
View File

@@ -17,6 +17,7 @@
package com.android.settings; package com.android.settings;
import static android.net.ConnectivityManager.NetworkCallback; import static android.net.ConnectivityManager.NetworkCallback;
import static android.provider.Settings.Global.PREFERRED_NETWORK_MODE;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
@@ -39,6 +40,7 @@ import android.os.AsyncResult;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.provider.Settings;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.CellInfo; import android.telephony.CellInfo;
import android.telephony.CellInfoCdma; import android.telephony.CellInfoCdma;
@@ -1451,6 +1453,19 @@ public class RadioInfo extends Activity {
if (mPreferredNetworkTypeResult != pos && pos >= 0 if (mPreferredNetworkTypeResult != pos && pos >= 0
&& pos <= mPreferredNetworkLabels.length - 2) { && pos <= mPreferredNetworkLabels.length - 2) {
mPreferredNetworkTypeResult = pos; mPreferredNetworkTypeResult = pos;
// TODO: Possibly migrate this to TelephonyManager.setPreferredNetworkType()
// which today still has some issues (mostly that the "set" is conditional
// on a successful modem call, which is not what we want). Instead we always
// want this setting to be set, so that if the radio hiccups and this setting
// is for some reason unsuccessful, future calls to the radio will reflect
// the users's preference which is set here.
final int subId = phone.getSubId();
if (SubscriptionManager.isUsableSubIdValue(subId)) {
Settings.Global.putInt(phone.getContext().getContentResolver(),
PREFERRED_NETWORK_MODE + subId, mPreferredNetworkTypeResult);
}
log("Calling setPreferredNetworkType(" + mPreferredNetworkTypeResult + ")");
Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE); Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE);
phone.setPreferredNetworkType(mPreferredNetworkTypeResult, msg); phone.setPreferredNetworkType(mPreferredNetworkTypeResult, msg);
} }