From 80b1c5608ec9cbb43c696d772eb69a2e220ef819 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 9 Dec 2014 20:22:08 -0800 Subject: Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#... ...testCallActivityOnNewIntent test fails with LMP-MR1 Release. Check for null. Also fix some small issues with converting intents to/from intents. Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14 --- core/java/android/app/Instrumentation.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/java/android/app/Instrumentation.java') diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index 3c30404..ad2b61f 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1217,8 +1217,10 @@ public class Instrumentation { public void callActivityOnNewIntent(Activity activity, ReferrerIntent intent) { final String oldReferrer = activity.mReferrer; try { - activity.mReferrer = intent.mReferrer; - callActivityOnNewIntent(activity, new Intent(intent)); + if (intent != null) { + activity.mReferrer = intent.mReferrer; + } + callActivityOnNewIntent(activity, intent != null ? new Intent(intent) : null); } finally { activity.mReferrer = oldReferrer; } -- cgit v1.1