From b65ea7bfc6797d1aa8ef359f144eb2b8070dbf72 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 20 Jun 2014 12:18:55 -0700
Subject: Fix issue #15689396: pre-installed DemoAPI tests fail...

...with a NPE on emulators running Google x86 API 19 image

Change-Id: Ib989127f48b0c02ec645b99827a9b775188684d8
---
 core/java/android/app/Instrumentation.java | 3 +++
 1 file changed, 3 insertions(+)

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) {
-- 
cgit v1.2.3-59-g8ed1b