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

Commit 16826766 authored by Jeongik Cha's avatar Jeongik Cha Committed by Android (Google) Code Review
Browse files

Merge changes from topic "system_ext" 

* changes:
  Consider overlay in system_ext as system's
  Support /system_ext partition
parents 1130ef82 cba95791

api/system-current.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -5179,7 +5179,8 @@ package android.os { 
    method @NonNull public static java.io.File getOdmDirectory();

    method @NonNull public static java.io.File getOdmDirectory();

    method @NonNull public static java.io.File getOemDirectory();

    method @NonNull public static java.io.File getOemDirectory();

    method @NonNull public static java.io.File getProductDirectory();

    method @NonNull public static java.io.File getProductDirectory();

    method @NonNull public static java.io.File getProductServicesDirectory();

    method @Deprecated @NonNull public static java.io.File getProductServicesDirectory();

    method @NonNull public static java.io.File getSystemExtDirectory();

    method @NonNull public static java.io.File getVendorDirectory();

    method @NonNull public static java.io.File getVendorDirectory();

  }

  }







































cmds/idmap2/idmap2/Scan.cpp



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -103,6 +103,7 @@ std::vector<std::string> PoliciesForPath(const std::string& apk_path) {









      {"/oem/", kPolicyOem},







      {"/oem/", kPolicyOem},











      {"/product/", kPolicyProduct},







      {"/product/", kPolicyProduct},











      {"/system/", kPolicySystem},







      {"/system/", kPolicySystem},














      {"/system_ext/", kPolicySystem},











      {"/vendor/", kPolicyVendor},







      {"/vendor/", kPolicyVendor},











  };







  };





















































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



+5
−5




























Original line number
Original line
Diff line number
Diff line








@@ -614,10 +614,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {





























    /**







    /**











     * Value for {@link #privateFlags}: whether this app is pre-installed on the







     * Value for {@link #privateFlags}: whether this app is pre-installed on the











     * google partition of the system image.







     * system_ext partition of the system image.











     * @hide







     * @hide











     */







     */











    public static final int PRIVATE_FLAG_PRODUCT_SERVICES = 1 << 21;







    public static final int PRIVATE_FLAG_SYSTEM_EXT = 1 << 21;































    /**







    /**











     * Indicates whether this package requires access to non-SDK APIs.







     * Indicates whether this package requires access to non-SDK APIs.










@@ -713,7 +713,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {









            PRIVATE_FLAG_USE_EMBEDDED_DEX,







            PRIVATE_FLAG_USE_EMBEDDED_DEX,











            PRIVATE_FLAG_PRIVILEGED,







            PRIVATE_FLAG_PRIVILEGED,











            PRIVATE_FLAG_PRODUCT,







            PRIVATE_FLAG_PRODUCT,











            PRIVATE_FLAG_PRODUCT_SERVICES,







            PRIVATE_FLAG_SYSTEM_EXT,











            PRIVATE_FLAG_PROFILEABLE_BY_SHELL,







            PRIVATE_FLAG_PROFILEABLE_BY_SHELL,











            PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER,







            PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER,











            PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY,







            PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY,










@@ -2046,8 +2046,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {









    }







    }































    /** @hide */







    /** @hide */











    public boolean isProductServices() {







    public boolean isSystemExt() {











        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PRODUCT_SERVICES) != 0;







        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_SYSTEM_EXT) != 0;











    }







    }































    /** @hide */







    /** @hide */

































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



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -6897,8 +6897,8 @@ public class PackageParser {









        }







        }































        /** @hide */







        /** @hide */











        public boolean isProductServices() {







        public boolean isSystemExt() {











            return applicationInfo.isProductServices();







            return applicationInfo.isSystemExt();











        }







        }































        /** @hide */







        /** @hide */

































core/java/android/os/Build.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -1191,7 +1191,7 @@ public class Build {









        ArrayList<Partition> partitions = new ArrayList();







        ArrayList<Partition> partitions = new ArrayList();































        String[] names = new String[] {







        String[] names = new String[] {











            "bootimage", "odm", "product", "product_services", Partition.PARTITION_NAME_SYSTEM,







            "bootimage", "odm", "product", "system_ext", Partition.PARTITION_NAME_SYSTEM,











            "vendor"







            "vendor"











        };







        };











        for (String name : names) {







        for (String name : names) {