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

Commit a1d8f42f authored by Adam Skory's avatar Adam Skory Committed by Android (Google) Code Review
Browse files

Merge "Make isAppProvidedWebUri false from setDefaultIntent()"

parents 5c3252ec a5381085

core/java/android/app/assist/AssistContent.java

+5 −1
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ public class AssistContent implements Parcelable { 
     */

    public void setDefaultIntent(Intent intent) {

        mIntent = intent;

        setWebUri(null);

        mIsAppProvidedIntent = false;

        mIsAppProvidedWebUri = false;

        mUri = null;

        if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {

            Uri uri = intent.getData();

            if (uri != null) {
@@ -161,6 +163,7 @@ public class AssistContent implements Parcelable { 
        }

        mIsAppProvidedIntent = in.readInt() == 1;

        mExtras = in.readBundle();

        mIsAppProvidedWebUri = in.readInt() == 1;

    }



    void writeToParcelInternal(Parcel dest, int flags) {
@@ -190,6 +193,7 @@ public class AssistContent implements Parcelable { 
        }

        dest.writeInt(mIsAppProvidedIntent ? 1 : 0);

        dest.writeBundle(mExtras);

        dest.writeInt(mIsAppProvidedWebUri ? 1 : 0);

    }



    @Override