Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread

Browse Source 
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
This commit is contained in:
John Wang
2010-10-07 14:00:53 -07:00
committed by Android Git Automerger
parent 82aacddef9 08fb5851bb
commit 5df4b5a78b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -367,4 +367,8 @@
<!-- Enables SIP on WIFI only -->
<bool name="config_sip_wifi_only">false</bool>
<!-- Boolean indicating if restoring network selection should be skipped -->
<!-- The restoring is handled by modem if it is true-->
<bool translatable="false" name="skip_restoring_network_selection">false</bool>
</resources>

10
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -358,8 +358,14 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
EVENT_SIM_RECORDS_LOADED, null);
mNeedToRegForSimLoaded = false;
}
// restore the previous network selection.
phone.restoreSavedNetworkSelection(null);
boolean skipRestoringSelection = phone.getContext().getResources().getBoolean(
com.android.internal.R.bool.skip_restoring_network_selection);
if (!skipRestoringSelection) {
// restore the previous network selection.
phone.restoreSavedNetworkSelection(null);
}
pollState();
// Signal strength polling stops when radio is off
queueNextSignalStrengthPoll();