diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-22 19:18:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-22 19:18:03 +0000 |
| commit | e7868959184ebf711ad7e67a22b51480ec2a9582 (patch) | |
| tree | 7dfd433ed5d6a1e0fd4d39db858427205199dd75 | |
| parent | ca5e72c5aeb85c99ed7a5ae3bf3a870462562352 (diff) | |
| parent | 84e001a9f514a047816f27db6ce836966efa481e (diff) | |
| download | frameworks_base-e7868959184ebf711ad7e67a22b51480ec2a9582.zip frameworks_base-e7868959184ebf711ad7e67a22b51480ec2a9582.tar.gz frameworks_base-e7868959184ebf711ad7e67a22b51480ec2a9582.tar.bz2 | |
Merge "Pass explicit null theme when preloading drawables" into lmp-dev
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 40c9ed2..4dde217 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -458,7 +458,7 @@ public class ZygoteInit { Log.v(TAG, "Preloading resource #" + Integer.toHexString(id)); } if (id != 0) { - if (mResources.getDrawable(id) == null) { + if (mResources.getDrawable(id, null) == null) { throw new IllegalArgumentException( "Unable to find preloaded drawable resource #0x" + Integer.toHexString(id) |