diff options
| author | Romain Guy <romainguy@google.com> | 2011-09-06 15:03:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 15:03:06 -0700 |
| commit | fe1aafe4acd881712384fab8e9fb5d0b01232dab (patch) | |
| tree | 25e5e4d6d220cd90b597f25e64e921c9190c8377 /core/java/android/view/View.java | |
| parent | b6738fc6a5ab08c23ecc7c0d84316f5fa5e05064 (diff) | |
| parent | c529d8d8c709aed9c9e6d87af3ce2eb4c73da4bf (diff) | |
| download | frameworks_base-fe1aafe4acd881712384fab8e9fb5d0b01232dab.zip frameworks_base-fe1aafe4acd881712384fab8e9fb5d0b01232dab.tar.gz frameworks_base-fe1aafe4acd881712384fab8e9fb5d0b01232dab.tar.bz2 | |
Merge "Prevent crash in View.createSnapshot if getResources() returns null Bug #5260241"
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index fa1d249..76b22ab 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -10320,7 +10320,10 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit throw new OutOfMemoryError(); } - bitmap.setDensity(getResources().getDisplayMetrics().densityDpi); + Resources resources = getResources(); + if (resources != null) { + bitmap.setDensity(resources.getDisplayMetrics().densityDpi); + } Canvas canvas; if (attachInfo != null) { |