diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-12-09 20:22:08 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-12-09 20:22:08 -0800 |
| commit | 80b1c5608ec9cbb43c696d772eb69a2e220ef819 (patch) | |
| tree | 571a80942418e49d832b000644c6d43ea2909683 /core/java/android/app | |
| parent | 8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6 (diff) | |
| download | frameworks_base-80b1c5608ec9cbb43c696d772eb69a2e220ef819.zip frameworks_base-80b1c5608ec9cbb43c696d772eb69a2e220ef819.tar.gz frameworks_base-80b1c5608ec9cbb43c696d772eb69a2e220ef819.tar.bz2 | |
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
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |