diff options
| author | 2014-06-20 20:38:12 +0000 | |
|---|---|---|
| committer | 2014-06-20 02:15:46 +0000 | |
| commit | a427fcf2cb6cc49e4f137e2853e3b6f51af940c5 (patch) | |
| tree | be2d98d31c89faff07a01e4718583b3d77f0f20e | |
| parent | 402c8f5a07470bd582a5e7d5c5ff581c5e03a545 (diff) | |
| parent | b65ea7bfc6797d1aa8ef359f144eb2b8070dbf72 (diff) | |
Merge "Fix issue #15689396: pre-installed DemoAPI tests fail..."
| -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 b78b9c983b24..c58399816cd1 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) { |