Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d0e599 authored by Jeff Brown's avatar Jeff Brown
Browse files

Update references to migrated global settings. 

Bug: 7231172
Change-Id: Id18cce843899452bd171d5eeff99b48ca65dfb1e
parent f4bfdd29

src/java/com/android/internal/telephony/PhoneBase.java

+2 −2
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ public abstract class PhoneBase extends Handler implements Phone { 


                if (!country.isEmpty()) {

                    try {

                        Settings.Secure.getInt(mContext.getContentResolver(),

                                Settings.Secure.WIFI_COUNTRY_CODE);

                        Settings.Global.getInt(mContext.getContentResolver(),

                                Settings.Global.WIFI_COUNTRY_CODE);

                    } catch (Settings.SettingNotFoundException e) {

                        // note this is not persisting

                        WifiManager wM = (WifiManager)

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+6 −6
Original line number Diff line number Diff line
@@ -252,8 +252,8 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
     */

    private void saveCdmaSubscriptionSource(int source) {

        log("Storing cdma subscription source: " + source);

        Secure.putInt(phone.getContext().getContentResolver(),

                Secure.CDMA_SUBSCRIPTION_MODE,

        Settings.Global.putInt(phone.getContext().getContentResolver(),

                Settings.Global.CDMA_SUBSCRIPTION_MODE,

                source );

    }
@@ -1399,10 +1399,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
                     */

                    long gained = c.getTimeInMillis() - System.currentTimeMillis();

                    long timeSinceLastUpdate = SystemClock.elapsedRealtime() - mSavedAtTime;

                    int nitzUpdateSpacing = Settings.Secure.getInt(cr,

                            Settings.Secure.NITZ_UPDATE_SPACING, mNitzUpdateSpacing);

                    int nitzUpdateDiff = Settings.Secure.getInt(cr,

                            Settings.Secure.NITZ_UPDATE_DIFF, mNitzUpdateDiff);

                    int nitzUpdateSpacing = Settings.Global.getInt(cr,

                            Settings.Global.NITZ_UPDATE_SPACING, mNitzUpdateSpacing);

                    int nitzUpdateDiff = Settings.Global.getInt(cr,

                            Settings.Global.NITZ_UPDATE_DIFF, mNitzUpdateDiff);



                    if ((mSavedAtTime == 0) || (timeSinceLastUpdate > nitzUpdateSpacing)

                            || (Math.abs(gained) > nitzUpdateDiff)) {

src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ public class CdmaSubscriptionSourceManager extends Handler { 
     */

    private int getDefaultCdmaSubscriptionSource() {

        // Get the default value from the Settings

        int subscriptionSource = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.CDMA_SUBSCRIPTION_MODE, PREFERRED_CDMA_SUBSCRIPTION);

        int subscriptionSource = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.CDMA_SUBSCRIPTION_MODE, PREFERRED_CDMA_SUBSCRIPTION);

        return subscriptionSource;

    }