Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f86e1967: am f4cf03dc: Merge "Use correct array index for Theme.getTheme()" into mnc-dev

Browse Source 
* commit 'f86e19678f8b92bb3b140b41102830dc91c2f18f':
  Use correct array index for Theme.getTheme()
This commit is contained in:
Alan Viverette
2015-05-08 18:38:06 +00:00
committed by Android Git Automerger
parent 11b3f477e7 f86e19678f
commit 6b226120d2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/res/Resources.java
View File

@@ -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]);
}