Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c02930e authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

Merge \\\"Make Activity.getReferrer tolerate custom Parcelables in intents\\\"... 

Merge \\\"Make Activity.getReferrer tolerate custom Parcelables in intents\\\" into nyc-dev am: 7a37f894 am: 64e3a6d7
am: 948b94ff

Change-Id: I941cabb11f6221eb8cb00487058145e6e83d4330
parents 7c5c3e38 948b94ff

core/java/android/app/Activity.java

+13 −7
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.hardware.input.InputManager; 
import android.media.AudioManager;

import android.media.session.MediaController;

import android.net.Uri;

import android.os.BadParcelableException;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;
@@ -5027,6 +5028,7 @@ public class Activity extends ContextThemeWrapper 
    @Nullable

    public Uri getReferrer() {

        Intent intent = getIntent();

        try {

            Uri referrer = intent.getParcelableExtra(Intent.EXTRA_REFERRER);

            if (referrer != null) {

                return referrer;
@@ -5035,6 +5037,10 @@ public class Activity extends ContextThemeWrapper 
            if (referrerName != null) {

                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) {

            return new Uri.Builder().scheme("android-app").authority(mReferrer).build();

        }