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

Commit 3a74114a authored by Pawan Wagh's avatar Pawan Wagh Committed by Android (Google) Code Review
Browse files

Merge "Add xml attribute for page size appcompat" into main

parents edff7795 4569f08c

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1276,6 +1276,7 @@ package android { 
    field public static final int paddingStart = 16843699; // 0x10103b3

    field public static final int paddingTop = 16842967; // 0x10100d7

    field public static final int paddingVertical = 16844094; // 0x101053e

    field @FlaggedApi("android.content.pm.app_compat_option_16kb") public static final int pageSizeCompat;

    field public static final int panelBackground = 16842846; // 0x101005e

    field public static final int panelColorBackground = 16842849; // 0x1010061

    field public static final int panelColorForeground = 16842848; // 0x1010060

core/java/android/content/pm/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -366,3 +366,13 @@ flag { 
    description: "Block app installations that specify an incompatible minor SDK version"

    bug: "377474232"

}



flag {

    name: "app_compat_option_16kb"

    is_exported: true

    namespace: "devoptions_settings"

    description: "Feature flag to enable page size app compat mode from manifest, package manager and settings level."

    bug: "371049373"

    is_fixed_read_only: true

}

core/res/res/values/attrs_manifest.xml

+14 −1
Original line number Diff line number Diff line
@@ -1862,6 +1862,16 @@ 
       <enum name="sync" value="2" />

    </attr>



    <!-- This attribute will be used to override app compatibility mode on 16 KB devices.

         If set to enabled, Natives lib will be extracted from APK if they are not page aligned on

         16 KB device. 4 KB natives libs will be loaded app-compat mode if they are eligible.

         @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) -->

    <attr name="pageSizeCompat">

        <enum name="enabled" value="5" />

        <enum name="disabled" value="6" />

    </attr>





    <!-- Attribution tag to be used for permission sub-attribution if a

      permission is checked in  {@link android.content.Context#sendBroadcast(Intent, String)}.

      Multiple tags can be specified separated by '|'.
@@ -2212,6 +2222,9 @@ 


        <attr name="memtagMode" />



        <!-- @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) -->

        <attr name="pageSizeCompat" />



        <!-- If {@code true} enables automatic zero initialization of all native heap

             allocations. -->

        <attr name="nativeHeapZeroInitialized" format="boolean" />

core/res/res/values/public-staging.xml

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ 
    <public name="alternateLauncherIcons"/>

    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_CHANGE_LAUNCHER_BADGING) -->

    <public name="alternateLauncherLabels"/>

    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) -->

    <public name="pageSizeCompat" />

  </staging-public-group>



  <staging-public-group type="id" first-id="0x01b60000">