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

Commit afada952 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Pass url to the AIA supervisor am: 52f179fd am: c2467b8c 

am: 8a3e8fe1

Change-Id: I0eb3494b91f88718f2bf07c99967441be05d3ce3
parents d2597f69 8a3e8fe1

services/core/java/com/android/server/am/ActivityStarter.java

+1 −3
Original line number Diff line number Diff line
@@ -542,9 +542,7 @@ class ActivityStarter { 
            ephemeralIntent.setPackage(ephemeralPackage);

        } else {

            // Success intent goes back to the installer

            // TODO; do we need any extras for the installer?

            ephemeralIntent = new Intent(launchIntent);

            ephemeralIntent.setData(null);

        }



        // Intent that is eventually launched if the ephemeral package was
@@ -569,7 +567,7 @@ class ActivityStarter { 
        intent.putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, new IntentSender(failureIntentTarget));

        intent.putExtra(Intent.EXTRA_EPHEMERAL_SUCCESS, new IntentSender(successIntentTarget));

        // TODO: Remove when the platform has fully implemented ephemeral apps

        intent.setData(origIntent.getData());

        intent.setData(origIntent.getData().buildUpon().clearQuery().build());

        return intent;

    }