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

Commit 5ff35689 authored by Nandana Dutt's avatar Nandana Dutt Committed by Android (Google) Code Review
Browse files

Merge changes from topic "preserve_legacy" 

* changes:
  Enforce the preserveLegacyExternalStorage manifest attribute
  Support preserveLegacyExternalStorage manifest attribute
  Introduce preserveLegacyExternalStorage manifest attribute
parents 1d2f970c 3ce38499

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,7 @@ package android { 
    field public static final int preferenceScreenStyle = 16842891; // 0x101008b

    field public static final int preferenceStyle = 16842894; // 0x101008e

    field public static final int presentationTheme = 16843712; // 0x10103c0

    field public static final int preserveLegacyExternalStorage = 16844312; // 0x1010618

    field public static final int previewImage = 16843482; // 0x10102da

    field public static final int primaryContentAlpha = 16844114; // 0x1010552

    field public static final int priority = 16842780; // 0x101001c

core/java/android/content/pm/parsing/AndroidPackage.java

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,8 @@ public interface AndroidPackage extends Parcelable { 


    boolean hasComponentClassName(String className);



    boolean hasPreserveLegacyExternalStorage();



    // App Info



    boolean hasRequestedLegacyExternalStorage();

core/java/android/content/pm/parsing/ApkParseUtils.java

+4 −0
Original line number Diff line number Diff line
@@ -2101,6 +2101,10 @@ public class ApkParseUtils { 
            parsingPackage.setAllowNativeHeapPointerTagging(sa.getBoolean(

                    R.styleable.AndroidManifestApplication_allowNativeHeapPointerTagging, true));



            parsingPackage.setPreserveLegacyExternalStorage(sa.getBoolean(

                            R.styleable.AndroidManifestApplication_preserveLegacyExternalStorage,

                            false));



            parsingPackage

                    .setMaxAspectRatio(

                            sa.getFloat(R.styleable.AndroidManifestApplication_maxAspectRatio, 0))

core/java/android/content/pm/parsing/PackageImpl.java

+12 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ public final class PackageImpl implements ParsingPackage, ParsedPackage, Android 
    private String[] usesLibraryFiles;

    private List<SharedLibraryInfo> usesLibraryInfos;

    private String zygotePreloadName;

    private boolean preserveLegacyExternalStorage;



    @VisibleForTesting

    public PackageImpl(
@@ -1518,6 +1519,12 @@ public final class PackageImpl implements ParsingPackage, ParsedPackage, Android 
        return this;

    }



    @Override

    public PackageImpl setPreserveLegacyExternalStorage(boolean preserveLegacyExternalStorage) {

        this.preserveLegacyExternalStorage = preserveLegacyExternalStorage;

        return this;

    }



    @Override

    public PackageImpl setUsesNonSdkApi(boolean usesNonSdkApi) {

        this.privateFlags = usesNonSdkApi
@@ -2999,6 +3006,11 @@ public final class PackageImpl implements ParsingPackage, ParsedPackage, Android 
        return queriesProviders;

    }



    @Override

    public boolean hasPreserveLegacyExternalStorage() {

        return preserveLegacyExternalStorage;

    }



    private static void internStringArrayList(List<String> list) {

        if (list != null) {

            final int N = list.size();

core/java/android/content/pm/parsing/ParsingPackage.java

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ public interface ParsingPackage extends AndroidPackage { 


    ParsingPackage setAllowNativeHeapPointerTagging(boolean allowNativeHeapPointerTagging);

  

    ParsingPackage setPreserveLegacyExternalStorage(boolean preserveLegacyExternalStorage);



    ParsingPackage setRestoreAnyVersion(boolean restoreAnyVersion);



    ParsingPackage setSplitHasCode(int splitIndex, boolean splitHasCode);