diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-08 18:15:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 18:15:48 +0000 |
| commit | f4cf03dcca8408dbcffb5737a84792bd2dc6a5e0 (patch) | |
| tree | 57623f2abf72d7ba8e298d8f36616f58a1228781 /core | |
| parent | a8dca228b254fd1553824d2c5de3aaedc2fe4400 (diff) | |
| parent | ac67409582aafd7c3f3f58a79b7b3292221a88b8 (diff) | |
| download | frameworks_base-f4cf03dcca8408dbcffb5737a84792bd2dc6a5e0.zip frameworks_base-f4cf03dcca8408dbcffb5737a84792bd2dc6a5e0.tar.gz frameworks_base-f4cf03dcca8408dbcffb5737a84792bd2dc6a5e0.tar.bz2 | |
Merge "Use correct array index for Theme.getTheme()" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/res/Resources.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index e65b4ca..a572590 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1804,8 +1804,8 @@ public class Resources { final int N = mKey.mCount; final String[] themes = new String[N * 2]; for (int i = 0, j = N - 1; i < themes.length; i += 2, --j) { - final int resId = mKey.mResId[i]; - final boolean forced = mKey.mForce[i]; + final int resId = mKey.mResId[j]; + final boolean forced = mKey.mForce[j]; try { themes[i] = getResourceName(resId); } catch (NotFoundException e) { @@ -1819,8 +1819,7 @@ public class Resources { /** @hide */ public void encode(@NonNull ViewHierarchyEncoder encoder) { encoder.beginObject(this); - // TODO: revert after getTheme() is fixed - String[] properties = new String[0]; // getTheme(); + final String[] properties = getTheme(); for (int i = 0; i < properties.length; i += 2) { encoder.addProperty(properties[i], properties[i+1]); } |