OSDN Git Service

Upgrade mode index settings after mode indices were cleaned
authorAlan Newberger <alann@google.com>
Wed, 23 Jul 2014 18:25:07 +0000 (11:25 -0700)
committerAlan Newberger <alann@google.com>
Wed, 23 Jul 2014 22:39:17 +0000 (15:39 -0700)
commit7bc335f4c69b8630f1619b2235991173fd8540a5
treedc0e4df4c1b870ae19e7ed4218f278740d952538
parent62c20bfb063743d636300ba49b89f16c6f2546d0
Upgrade mode index settings after mode indices were cleaned

Because we removed a mode index from the camera_mode_* sequence in res/values/arrays.xml,
upgrades were found to crash when settings referred to the old, now nonexistent mode value.
This CL preserves the arrays cleanup and adds a settings upgrade to convert modes to the
new value. Tested and works properly with mode preservation.

Bug: 16467318
Change-Id: I1352a940285687af38290250d7a06b5b7c421338
src/com/android/camera/settings/UpgradeAosp.java
src/com/android/camera/util/CameraUtil.java