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

Commit f0ff68f6 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "androidpackage" 

* changes:
  Critical fixes for AndroidPackage migration
  Revert Revert PackageParser#Package fixes
  Revert "Revert "Deprecate PackageParser#Package""
parents 838c56cf 6571c8a4

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ java_defaults { 


    exclude_srcs: [

        // See comment on framework-atb-backward-compatibility module below

        "core/java/android/content/pm/AndroidTestBaseUpdater.java",

        "core/java/android/content/pm/parsing/library/AndroidTestBaseUpdater.java",

    ],



    sdk_version: "core_platform",
@@ -526,7 +526,7 @@ java_library { 
    installable: true,

    libs: ["app-compat-annotations"],

    srcs: [

        "core/java/android/content/pm/AndroidTestBaseUpdater.java",

        "core/java/android/content/pm/parsing/library/AndroidTestBaseUpdater.java",

    ],

}

config/preloaded-classes

+6 −6
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ android.content.pm.-$$Lambda$jpya2qgMDDEok2GAoKRDqPM5lIE 
android.content.pm.ActivityInfo$1

android.content.pm.ActivityInfo$WindowLayout

android.content.pm.ActivityInfo

android.content.pm.AndroidHidlUpdater

android.content.pm.parsing.library.AndroidHidlUpdater

android.content.pm.ApplicationInfo$1

android.content.pm.ApplicationInfo

android.content.pm.BaseParceledListSlice
@@ -922,10 +922,10 @@ android.content.pm.LauncherApps$1 
android.content.pm.LauncherApps

android.content.pm.ModuleInfo$1

android.content.pm.ModuleInfo

android.content.pm.OrgApacheHttpLegacyUpdater

android.content.pm.PackageBackwardCompatibility$AndroidTestRunnerSplitUpdater

android.content.pm.PackageBackwardCompatibility$RemoveUnnecessaryAndroidTestBaseLibrary

android.content.pm.PackageBackwardCompatibility

android.content.pm.parsing.library.OrgApacheHttpLegacyUpdater

android.content.pm.parsing.library.PackageBackwardCompatibility$AndroidTestRunnerSplitUpdater

android.content.pm.parsing.library.PackageBackwardCompatibility$RemoveUnnecessaryAndroidTestBaseLibrary

android.content.pm.parsing.library.PackageBackwardCompatibility

android.content.pm.PackageInfo$1

android.content.pm.PackageInfo

android.content.pm.PackageInstaller$Session
@@ -960,7 +960,7 @@ android.content.pm.PackageParser$SigningDetails$1 
android.content.pm.PackageParser$SigningDetails

android.content.pm.PackageParser$SplitNameComparator

android.content.pm.PackageParser

android.content.pm.PackageSharedLibraryUpdater

android.content.pm.parsing.library.PackageSharedLibraryUpdater

android.content.pm.PackageStats$1

android.content.pm.PackageStats

android.content.pm.PackageUserState

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

+2 −1
Original line number Diff line number Diff line
@@ -1376,7 +1376,8 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
            this.minHeight = minHeight;

        }



        WindowLayout(Parcel source) {

        /** @hide */

        public WindowLayout(Parcel source) {

            width = source.readInt();

            widthFraction = source.readFloat();

            height = source.readInt();

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

+2 −1
Original line number Diff line number Diff line
@@ -373,8 +373,9 @@ public class PackageInfo implements Parcelable { 


    /**

     * Whether the overlay is static, meaning it cannot be enabled/disabled at runtime.

     * @hide

     */

    boolean mOverlayIsStatic;

    public boolean mOverlayIsStatic;



    /**

     * The user-visible SDK version (ex. 26) of the framework against which the application claims

core/java/android/content/pm/PackageParser.java

+237 −201

File changed.

Preview size limit exceeded, changes collapsed.