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

Commit d5f1a555 authored by Zheng Zhang's avatar Zheng Zhang
Browse files

DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123. 

HFP profile config landed late in Emerald development, and was committed
as version 122 there.
When it merged to master, there were conflicts since 122 was already
taken, so it was resolved as version 123.
We didn't catch the subtle bug then:
This means Emerald devices will reset HFP profile config in error once
they upgrade to Feldspar.
Correct this by merging 122, and making 123 a no-op.

Bug: 37338202
Change-Id: Ibf4c824d27300641fd1bb15f5884baf056bd8d7e
parent 2c42db20

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+9 −3
Original line number Diff line number Diff line
@@ -2276,15 +2276,21 @@ public class SettingsProvider extends ContentProvider { 
                                    SettingsState.SYSTEM_PACKAGE_NAME);

                        }

                    }

                    currentVersion = 123;

                }



                if (currentVersion == 123) {

                    // Those content is moved from version 123, only for F, ref: b/37338202.

                    final SettingsState globalSettings = getGlobalSettingsLocked();

                    String defaultDisabledProfiles = (getContext().getResources().getString(

                            R.string.def_bluetooth_disabled_profiles));

                    globalSettings.insertSettingLocked(Settings.Global.BLUETOOTH_DISABLED_PROFILES,

                            defaultDisabledProfiles, SettingsState.SYSTEM_PACKAGE_NAME);



                    currentVersion = 124;

                }



                if (currentVersion == 123) {

                    // Due to merge resolution, the version 123's content on Emerald is in version 

                    // 122. If keep the content in version 123, OTA from E to F would reset the HFP

                    // config, ref: b/37338202. So we need skip version 123 on F, and only on F.

                    currentVersion = 124;

                }