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

Commit aa5fb53b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Update more Parcelables to send Strings UTF-8." into rvc-dev am: 1eb3fcfb am: e9214abd 

Change-Id: Ic5f0612acc0f10dfc5b5a216845bd0f04211185a
parents 14fed526 e9214abd

core/java/android/content/pm/ApplicationInfo.java

+12 −15
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.annotation.TestApi; 
import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ProcessInfo;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.os.Build;
@@ -39,8 +38,6 @@ import android.util.SparseArray; 
import android.util.proto.ProtoOutputStream;



import com.android.internal.util.ArrayUtils;

import com.android.internal.util.Parcelling;

import com.android.internal.util.Parcelling.BuiltIn.ForBoolean;

import com.android.server.SystemConfig;



import java.lang.annotation.Retention;
@@ -1725,9 +1722,9 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeString8(scanPublicSourceDir);

        dest.writeString8(sourceDir);

        dest.writeString8(publicSourceDir);

        dest.writeStringArray(splitNames);

        dest.writeStringArray(splitSourceDirs);

        dest.writeStringArray(splitPublicSourceDirs);

        dest.writeString8Array(splitNames);

        dest.writeString8Array(splitSourceDirs);

        dest.writeString8Array(splitPublicSourceDirs);

        dest.writeSparseArray((SparseArray) splitDependencies);

        dest.writeString8(nativeLibraryDir);

        dest.writeString8(secondaryNativeLibraryDir);
@@ -1735,10 +1732,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeInt(nativeLibraryRootRequiresIsa ? 1 : 0);

        dest.writeString8(primaryCpuAbi);

        dest.writeString8(secondaryCpuAbi);

        dest.writeStringArray(resourceDirs);

        dest.writeString8Array(resourceDirs);

        dest.writeString8(seInfo);

        dest.writeString8(seInfoUser);

        dest.writeStringArray(sharedLibraryFiles);

        dest.writeString8Array(sharedLibraryFiles);

        dest.writeTypedList(sharedLibraryInfos);

        dest.writeString8(dataDir);

        dest.writeString8(deviceProtectedDataDir);
@@ -1760,7 +1757,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeInt(category);

        dest.writeInt(targetSandboxVersion);

        dest.writeString8(classLoaderName);

        dest.writeStringArray(splitClassLoaderNames);

        dest.writeString8Array(splitClassLoaderNames);

        dest.writeInt(compileSdkVersion);

        dest.writeString8(compileSdkVersionCodename);

        dest.writeString8(appComponentFactory);
@@ -1806,9 +1803,9 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        scanPublicSourceDir = source.readString8();

        sourceDir = source.readString8();

        publicSourceDir = source.readString8();

        splitNames = source.readStringArray();

        splitSourceDirs = source.readStringArray();

        splitPublicSourceDirs = source.readStringArray();

        splitNames = source.createString8Array();

        splitSourceDirs = source.createString8Array();

        splitPublicSourceDirs = source.createString8Array();

        splitDependencies = source.readSparseArray(null);

        nativeLibraryDir = source.readString8();

        secondaryNativeLibraryDir = source.readString8();
@@ -1816,10 +1813,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        nativeLibraryRootRequiresIsa = source.readInt() != 0;

        primaryCpuAbi = source.readString8();

        secondaryCpuAbi = source.readString8();

        resourceDirs = source.readStringArray();

        resourceDirs = source.createString8Array();

        seInfo = source.readString8();

        seInfoUser = source.readString8();

        sharedLibraryFiles = source.readStringArray();

        sharedLibraryFiles = source.createString8Array();

        sharedLibraryInfos = source.createTypedArrayList(SharedLibraryInfo.CREATOR);

        dataDir = source.readString8();

        deviceProtectedDataDir = source.readString8();
@@ -1841,7 +1838,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        category = source.readInt();

        targetSandboxVersion = source.readInt();

        classLoaderName = source.readString8();

        splitClassLoaderNames = source.readStringArray();

        splitClassLoaderNames = source.createString8Array();

        compileSdkVersion = source.readInt();

        compileSdkVersionCodename = source.readString8();

        appComponentFactory = source.readString8();

core/java/android/content/pm/InstrumentationInfo.java

+6 −6
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeString8(targetProcesses);

        dest.writeString8(sourceDir);

        dest.writeString8(publicSourceDir);

        dest.writeStringArray(splitNames);

        dest.writeStringArray(splitSourceDirs);

        dest.writeStringArray(splitPublicSourceDirs);

        dest.writeString8Array(splitNames);

        dest.writeString8Array(splitSourceDirs);

        dest.writeString8Array(splitPublicSourceDirs);

        dest.writeSparseArray((SparseArray) splitDependencies);

        dest.writeString8(dataDir);

        dest.writeString8(deviceProtectedDataDir);
@@ -193,9 +193,9 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable { 
        targetProcesses = source.readString8();

        sourceDir = source.readString8();

        publicSourceDir = source.readString8();

        splitNames = source.readStringArray();

        splitSourceDirs = source.readStringArray();

        splitPublicSourceDirs = source.readStringArray();

        splitNames = source.createString8Array();

        splitSourceDirs = source.createString8Array();

        splitPublicSourceDirs = source.createString8Array();

        splitDependencies = source.readSparseArray(null);

        dataDir = source.readString8();

        deviceProtectedDataDir = source.readString8();

core/java/android/content/pm/PackageInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ public class PackageInfo implements Parcelable { 
        // Allow ApplicationInfo to be squashed.

        final boolean prevAllowSquashing = dest.allowSquashing();

        dest.writeString8(packageName);

        dest.writeStringArray(splitNames);

        dest.writeString8Array(splitNames);

        dest.writeInt(versionCode);

        dest.writeInt(versionCodeMajor);

        dest.writeString8(versionName);
@@ -465,7 +465,7 @@ public class PackageInfo implements Parcelable { 
        dest.writeTypedArray(providers, parcelableFlags);

        dest.writeTypedArray(instrumentation, parcelableFlags);

        dest.writeTypedArray(permissions, parcelableFlags);

        dest.writeStringArray(requestedPermissions);

        dest.writeString8Array(requestedPermissions);

        dest.writeIntArray(requestedPermissionsFlags);

        dest.writeTypedArray(signatures, parcelableFlags);

        dest.writeTypedArray(configPreferences, parcelableFlags);
@@ -509,7 +509,7 @@ public class PackageInfo implements Parcelable { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    private PackageInfo(Parcel source) {

        packageName = source.readString8();

        splitNames = source.createStringArray();

        splitNames = source.createString8Array();

        versionCode = source.readInt();

        versionCodeMajor = source.readInt();

        versionName = source.readString8();
@@ -530,7 +530,7 @@ public class PackageInfo implements Parcelable { 
        providers = source.createTypedArray(ProviderInfo.CREATOR);

        instrumentation = source.createTypedArray(InstrumentationInfo.CREATOR);

        permissions = source.createTypedArray(PermissionInfo.CREATOR);

        requestedPermissions = source.createStringArray();

        requestedPermissions = source.createString8Array();

        requestedPermissionsFlags = source.createIntArray();

        signatures = source.createTypedArray(Signature.CREATOR);

        configPreferences = source.createTypedArray(ConfigurationInfo.CREATOR);

core/java/android/content/pm/PermissionInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -618,8 +618,8 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
        super.writeToParcel(dest, parcelableFlags);

        dest.writeInt(protectionLevel);

        dest.writeInt(flags);

        dest.writeString(group);

        dest.writeString(backgroundPermission);

        dest.writeString8(group);

        dest.writeString8(backgroundPermission);

        dest.writeInt(descriptionRes);

        dest.writeInt(requestRes);

        TextUtils.writeToParcel(nonLocalizedDescription, dest, parcelableFlags);
@@ -678,8 +678,8 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
        super(source);

        protectionLevel = source.readInt();

        flags = source.readInt();

        group = source.readString();

        backgroundPermission = source.readString();

        group = source.readString8();

        backgroundPermission = source.readString8();

        descriptionRes = source.readInt();

        requestRes = source.readInt();

        nonLocalizedDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);

core/java/android/content/pm/ResolveInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ public class ResolveInfo implements Parcelable { 
        dest.writeInt(labelRes);

        TextUtils.writeToParcel(nonLocalizedLabel, dest, parcelableFlags);

        dest.writeInt(icon);

        dest.writeString(resolvePackageName);

        dest.writeString8(resolvePackageName);

        dest.writeInt(targetUserId);

        dest.writeInt(system ? 1 : 0);

        dest.writeInt(noResourceId ? 1 : 0);
@@ -491,7 +491,7 @@ public class ResolveInfo implements Parcelable { 
        nonLocalizedLabel

                = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);

        icon = source.readInt();

        resolvePackageName = source.readString();

        resolvePackageName = source.readString8();

        targetUserId = source.readInt();

        system = source.readInt() != 0;

        noResourceId = source.readInt() != 0;