diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-06-20 12:18:55 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-06-20 12:18:55 -0700 |
| commit | b65ea7bfc6797d1aa8ef359f144eb2b8070dbf72 (patch) | |
| tree | aba2392c8636495409608235aa031ea2d6f1fe14 /core/java/android | |
| parent | 53ad2a15d524d6eb3730cd122b3ece27358123ad (diff) | |
| download | frameworks_base-b65ea7bfc6797d1aa8ef359f144eb2b8070dbf72.zip frameworks_base-b65ea7bfc6797d1aa8ef359f144eb2b8070dbf72.tar.gz frameworks_base-b65ea7bfc6797d1aa8ef359f144eb2b8070dbf72.tar.bz2 | |
Fix issue #15689396: pre-installed DemoAPI tests fail...
...with a NPE on emulators running Google x86 API 19 image
Change-Id: Ib989127f48b0c02ec645b99827a9b775188684d8
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index b78b9c9..c583998 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -188,6 +188,9 @@ public class Instrumentation { endPerformanceSnapshot(); } if (mPerfMetrics != null) { + if (results == null) { + results = new Bundle(); + } results.putAll(mPerfMetrics); } if (mUiAutomation != null) { |