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

Commit b67e70aa authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "apr19" into rvc-dev 

* changes:
  Update some Parcelables to send Strings UTF-8.
  Offer to write Strings through Parcels as UTF-8.
parents 81f5ea40 0223df09

core/java/android/app/Notification.java

+12 −12
Original line number Diff line number Diff line
@@ -2301,11 +2301,11 @@ public class Notification implements Parcelable 


        priority = parcel.readInt();



        category = parcel.readString();

        category = parcel.readString8();



        mGroupKey = parcel.readString();

        mGroupKey = parcel.readString8();



        mSortKey = parcel.readString();

        mSortKey = parcel.readString8();



        extras = Bundle.setDefusable(parcel.readBundle(), true); // may be null

        fixDuplicateExtras();
@@ -2329,12 +2329,12 @@ public class Notification implements Parcelable 
        color = parcel.readInt();



        if (parcel.readInt() != 0) {

            mChannelId = parcel.readString();

            mChannelId = parcel.readString8();

        }

        mTimeout = parcel.readLong();



        if (parcel.readInt() != 0) {

            mShortcutId = parcel.readString();

            mShortcutId = parcel.readString8();

        }



        if (parcel.readInt() != 0) {
@@ -2766,11 +2766,11 @@ public class Notification implements Parcelable 


        parcel.writeInt(priority);



        parcel.writeString(category);

        parcel.writeString8(category);



        parcel.writeString(mGroupKey);

        parcel.writeString8(mGroupKey);



        parcel.writeString(mSortKey);

        parcel.writeString8(mSortKey);



        parcel.writeBundle(extras); // null ok
@@ -2803,7 +2803,7 @@ public class Notification implements Parcelable 


        if (mChannelId != null) {

            parcel.writeInt(1);

            parcel.writeString(mChannelId);

            parcel.writeString8(mChannelId);

        } else {

            parcel.writeInt(0);

        }
@@ -2811,7 +2811,7 @@ public class Notification implements Parcelable 


        if (mShortcutId != null) {

            parcel.writeInt(1);

            parcel.writeString(mShortcutId);

            parcel.writeString8(mShortcutId);

        } else {

            parcel.writeInt(0);

        }
@@ -8873,7 +8873,7 @@ public class Notification implements Parcelable 
            }

            mDesiredHeightResId = in.readInt();

            if (in.readInt() != 0) {

                mShortcutId = in.readString();

                mShortcutId = in.readString8();

            }

        }
@@ -9029,7 +9029,7 @@ public class Notification implements Parcelable 
            out.writeInt(mDesiredHeightResId);

            out.writeInt(TextUtils.isEmpty(mShortcutId) ? 0 : 1);

            if (!TextUtils.isEmpty(mShortcutId)) {

                out.writeString(mShortcutId);

                out.writeString8(mShortcutId);

            }

        }

core/java/android/content/ClipData.java

+2 −2
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ public class ClipData implements Parcelable { 
            }

        } else {

            dest.writeInt(PARCEL_TYPE_STRING);

            dest.writeString(text);

            dest.writeString8(text);

        }

    }
@@ -1215,7 +1215,7 @@ public class ClipData implements Parcelable { 
     */

    private static String readHtmlTextFromParcel(Parcel in) {

        if (in.readInt() == PARCEL_TYPE_STRING) {

            return in.readString();

            return in.readString8();

        }

        ParcelFileDescriptor pfd =

                in.readParcelable(ParcelFileDescriptor.class.getClassLoader());

core/java/android/content/ContentProviderOperation.java

+8 −8
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ public class ContentProviderOperation implements Parcelable { 
    private ContentProviderOperation(Parcel source) {

        mType = source.readInt();

        mUri = Uri.CREATOR.createFromParcel(source);

        mMethod = source.readInt() != 0 ? source.readString() : null;

        mArg = source.readInt() != 0 ? source.readString() : null;

        mMethod = source.readInt() != 0 ? source.readString8() : null;

        mArg = source.readInt() != 0 ? source.readString8() : null;

        final int valuesSize = source.readInt();

        if (valuesSize != -1) {

            mValues = new ArrayMap<>(valuesSize);
@@ -107,7 +107,7 @@ public class ContentProviderOperation implements Parcelable { 
        } else {

            mExtras = null;

        }

        mSelection = source.readInt() != 0 ? source.readString() : null;

        mSelection = source.readInt() != 0 ? source.readString8() : null;

        mSelectionArgs = source.readSparseArray(null);

        mExpectedCount = source.readInt() != 0 ? source.readInt() : null;

        mYieldAllowed = source.readInt() != 0;
@@ -135,13 +135,13 @@ public class ContentProviderOperation implements Parcelable { 
        Uri.writeToParcel(dest, mUri);

        if (mMethod != null) {

            dest.writeInt(1);

            dest.writeString(mMethod);

            dest.writeString8(mMethod);

        } else {

            dest.writeInt(0);

        }

        if (mArg != null) {

            dest.writeInt(1);

            dest.writeString(mArg);

            dest.writeString8(mArg);

        } else {

            dest.writeInt(0);

        }
@@ -159,7 +159,7 @@ public class ContentProviderOperation implements Parcelable { 
        }

        if (mSelection != null) {

            dest.writeInt(1);

            dest.writeString(mSelection);

            dest.writeString8(mSelection);

        } else {

            dest.writeInt(0);

        }
@@ -591,7 +591,7 @@ public class ContentProviderOperation implements Parcelable { 
        public BackReference(Parcel src) {

            this.fromIndex = src.readInt();

            if (src.readInt() != 0) {

                this.fromKey = src.readString();

                this.fromKey = src.readString8();

            } else {

                this.fromKey = null;

            }
@@ -620,7 +620,7 @@ public class ContentProviderOperation implements Parcelable { 
            dest.writeInt(fromIndex);

            if (fromKey != null) {

                dest.writeInt(1);

                dest.writeString(fromKey);

                dest.writeString8(fromKey);

            } else {

                dest.writeInt(0);

            }

core/java/android/content/Intent.java

+14 −14
Original line number Diff line number Diff line
@@ -888,8 +888,8 @@ public class Intent implements Parcelable, Cloneable { 


                public ShortcutIconResource createFromParcel(Parcel source) {

                    ShortcutIconResource icon = new ShortcutIconResource();

                    icon.packageName = source.readString();

                    icon.resourceName = source.readString();

                    icon.packageName = source.readString8();

                    icon.resourceName = source.readString8();

                    return icon;

                }
@@ -906,8 +906,8 @@ public class Intent implements Parcelable, Cloneable { 
        }



        public void writeToParcel(Parcel dest, int flags) {

            dest.writeString(packageName);

            dest.writeString(resourceName);

            dest.writeString8(packageName);

            dest.writeString8(resourceName);

        }



        @Override
@@ -10807,12 +10807,12 @@ public class Intent implements Parcelable, Cloneable { 
    }



    public void writeToParcel(Parcel out, int flags) {

        out.writeString(mAction);

        out.writeString8(mAction);

        Uri.writeToParcel(out, mData);

        out.writeString(mType);

        out.writeString(mIdentifier);

        out.writeString8(mType);

        out.writeString8(mIdentifier);

        out.writeInt(mFlags);

        out.writeString(mPackage);

        out.writeString8(mPackage);

        ComponentName.writeToParcel(mComponent, out);



        if (mSourceBounds != null) {
@@ -10826,7 +10826,7 @@ public class Intent implements Parcelable, Cloneable { 
            final int N = mCategories.size();

            out.writeInt(N);

            for (int i=0; i<N; i++) {

                out.writeString(mCategories.valueAt(i));

                out.writeString8(mCategories.valueAt(i));

            }

        } else {

            out.writeInt(0);
@@ -10865,12 +10865,12 @@ public class Intent implements Parcelable, Cloneable { 
    }



    public void readFromParcel(Parcel in) {

        setAction(in.readString());

        setAction(in.readString8());

        mData = Uri.CREATOR.createFromParcel(in);

        mType = in.readString();

        mIdentifier = in.readString();

        mType = in.readString8();

        mIdentifier = in.readString8();

        mFlags = in.readInt();

        mPackage = in.readString();

        mPackage = in.readString8();

        mComponent = ComponentName.readFromParcel(in);



        if (in.readInt() != 0) {
@@ -10882,7 +10882,7 @@ public class Intent implements Parcelable, Cloneable { 
            mCategories = new ArraySet<String>();

            int i;

            for (i=0; i<N; i++) {

                mCategories.add(in.readString().intern());

                mCategories.add(in.readString8().intern());

            }

        } else {

            mCategories = null;

core/java/android/content/pm/ActivityInfo.java

+14 −14
Original line number Diff line number Diff line
@@ -1206,17 +1206,17 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
        dest.writeInt(theme);

        dest.writeInt(launchMode);

        dest.writeInt(documentLaunchMode);

        dest.writeString(permission);

        dest.writeString(taskAffinity);

        dest.writeString(targetActivity);

        dest.writeString(launchToken);

        dest.writeString8(permission);

        dest.writeString8(taskAffinity);

        dest.writeString8(targetActivity);

        dest.writeString8(launchToken);

        dest.writeInt(flags);

        dest.writeInt(privateFlags);

        dest.writeInt(screenOrientation);

        dest.writeInt(configChanges);

        dest.writeInt(softInputMode);

        dest.writeInt(uiOptions);

        dest.writeString(parentActivityName);

        dest.writeString8(parentActivityName);

        dest.writeInt(persistableMode);

        dest.writeInt(maxRecents);

        dest.writeInt(lockTaskLaunchMode);
@@ -1227,7 +1227,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
            dest.writeInt(0);

        }

        dest.writeInt(resizeMode);

        dest.writeString(requestedVrComponent);

        dest.writeString8(requestedVrComponent);

        dest.writeInt(rotationAnimation);

        dest.writeInt(colorMode);

        dest.writeFloat(maxAspectRatio);
@@ -1327,17 +1327,17 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
        theme = source.readInt();

        launchMode = source.readInt();

        documentLaunchMode = source.readInt();

        permission = source.readString();

        taskAffinity = source.readString();

        targetActivity = source.readString();

        launchToken = source.readString();

        permission = source.readString8();

        taskAffinity = source.readString8();

        targetActivity = source.readString8();

        launchToken = source.readString8();

        flags = source.readInt();

        privateFlags = source.readInt();

        screenOrientation = source.readInt();

        configChanges = source.readInt();

        softInputMode = source.readInt();

        uiOptions = source.readInt();

        parentActivityName = source.readString();

        parentActivityName = source.readString8();

        persistableMode = source.readInt();

        maxRecents = source.readInt();

        lockTaskLaunchMode = source.readInt();
@@ -1345,7 +1345,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
            windowLayout = new WindowLayout(source);

        }

        resizeMode = source.readInt();

        requestedVrComponent = source.readString();

        requestedVrComponent = source.readString8();

        rotationAnimation = source.readInt();

        colorMode = source.readInt();

        maxAspectRatio = source.readFloat();
@@ -1386,7 +1386,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
            gravity = source.readInt();

            minWidth = source.readInt();

            minHeight = source.readInt();

            windowLayoutAffinity = source.readString();

            windowLayoutAffinity = source.readString8();

        }



        /**
@@ -1476,7 +1476,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
            dest.writeInt(gravity);

            dest.writeInt(minWidth);

            dest.writeInt(minHeight);

            dest.writeString(windowLayoutAffinity);

            dest.writeString8(windowLayoutAffinity);

        }

    }

}