Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-09 20:57:52 +00:00
committed by Android (Google) Code Review
parent 142fc425c4 d3c63a66f2
commit 7a37f8945f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/Activity.java
View File

@@ -57,6 +57,7 @@ import android.hardware.input.InputManager;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.session.MediaController; import android.media.session.MediaController;
import android.net.Uri; import android.net.Uri;
import android.os.BadParcelableException;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@@ -5006,6 +5007,7 @@ public class Activity extends ContextThemeWrapper
@Nullable @Nullable
public Uri getReferrer() { public Uri getReferrer() {
Intent intent = getIntent(); Intent intent = getIntent();
try {
Uri referrer = intent.getParcelableExtra(Intent.EXTRA_REFERRER); Uri referrer = intent.getParcelableExtra(Intent.EXTRA_REFERRER);
if (referrer != null) { if (referrer != null) {
return referrer; return referrer;
@@ -5014,6 +5016,10 @@ public class Activity extends ContextThemeWrapper
if (referrerName != null) { if (referrerName != null) {
return Uri.parse(referrerName); return Uri.parse(referrerName);
} }
} catch (BadParcelableException e) {
Log.w(TAG, "Cannot read referrer from intent;"
+ " intent extras contain unknown custom Parcelable objects");
}
if (mReferrer != null) { if (mReferrer != null) {
return new Uri.Builder().scheme("android-app").authority(mReferrer).build(); return new Uri.Builder().scheme("android-app").authority(mReferrer).build();
} }