OSDN Git Service

Restore device locale from backup.
authorSeigo Nonaka <nona@google.com>
Mon, 26 Jun 2017 23:06:17 +0000 (16:06 -0700)
committerSeigo Nonaka <nona@google.com>
Mon, 10 Jul 2017 23:04:59 +0000 (16:04 -0700)
commit0f19cc779fb81bca0d00fd0a062f431cedb5f684
tree07c253ab4abf07bf577c1be67dc560fe97f4a225
parentab78a4707b276a58c758e5a7122a21d75403497b
Restore device locale from backup.

The locales are merged with following policy.
- Don't change UI locale.
- Don't add unsupported locales.
- Don't add duplicated locales.

Bug: 35391006
Test: com.android.providers.settings.SettingsHelperTest
Test: Did the following tests manually.
1. Login with Google account during SUW.
2. Set locale to "zh-TW,en-US"
3. adb shell bmgr backupnow com.android.providers.settings
4. fastboot flash userdata && fastboot reboot
5. adb reboot bootloader
6. fastboot flash userdata && fastboot reboot
7. Choose "Japanese" as the first menu on the SUW.
8. Backup from cloud with logging in to the Google account.
9. After compete SUW, verify the device locale is "ja-JP,zh-TW,en-US"

Change-Id: I1e6c7ba5b7abb6bde8b01ce0f647c04a5caa81a6
packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
packages/SettingsProvider/test/Android.mk
packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperTest.java [new file with mode: 0644]