diff options
| author | Alan Newberger <alann@google.com> | 2014-10-05 06:52:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-05 06:52:01 +0000 |
| commit | 0021c30190af49119ee319af6b207643b417c6c3 (patch) | |
| tree | bc51facb8061087655009167eb3209d5b4980a79 | |
| parent | a9ed2418a9d52d07bcbddfbb1bb144d9a0c6e8cd (diff) | |
| parent | 449c6ceb78279b8a2eecba31e1731d4df45345bc (diff) | |
| download | android_packages_apps_Camera2-0021c30190af49119ee319af6b207643b417c6c3.tar.gz android_packages_apps_Camera2-0021c30190af49119ee319af6b207643b417c6c3.tar.bz2 android_packages_apps_Camera2-0021c30190af49119ee319af6b207643b417c6c3.zip | |
Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
| -rw-r--r-- | src/com/android/camera/settings/AppUpgrader.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java index 8e4d1db2e..bb15d38dd 100644 --- a/src/com/android/camera/settings/AppUpgrader.java +++ b/src/com/android/camera/settings/AppUpgrader.java @@ -334,8 +334,12 @@ public class AppUpgrader extends SettingsUpgrader { Map<String, ?> entries = oldPrefs.getAll(); for (Map.Entry<String, ?> entry : entries.entrySet()) { String key = entry.getKey(); - String value = entry.getValue().toString(); - newPrefs.edit().putString(key, value).apply(); + Object value = entry.getValue(); + if (value != null) { + newPrefs.edit().putString(key, String.valueOf(value)).apply(); + } else { + Log.w(TAG, "skipped upgrade for null key " + key); + } } } |