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

Commit d7ad686f authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Add feature flag for the new role SYSTEM_VENDOR_INTELLIGENCE" into main

parents 6d9ca16b 22ba998b

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ package android { 
    field public static final int config_systemTextIntelligence = 17039414; // 0x1040036

    field public static final int config_systemUi = 17039418; // 0x104003a

    field public static final int config_systemUiIntelligence = 17039410; // 0x1040032

    field @FlaggedApi("android.permission.flags.system_vendor_intelligence_role_enabled") public static final int config_systemVendorIntelligence;

    field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037

    field public static final int config_systemWearHealthService = 17039428; // 0x1040044

    field public static final int config_systemWellbeing = 17039408; // 0x1040030

core/java/android/permission/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -483,3 +483,12 @@ flag { 
    description: "Rate limit async noteOp callbacks for batched noteOperation binder call"

    bug: "366013082"

}



flag {

    name: "system_vendor_intelligence_role_enabled"

    is_exported: true

    is_fixed_read_only: true

    namespace: "permissions"

    description: "This flag is used to enable the role system_vendor_intelligence"

    bug: "377553620"

}

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -7276,4 +7276,9 @@ 
    <!-- List of protected packages that require biometric authentication for modification

         (Disable, force-stop or uninstalling updates). -->

    <string-array name="config_biometric_protected_package_names" translatable="false" />



    <!-- Package name of the on-device intelligent processor for vendor specific

         features. Examples include the search functionality or the app

         predictor. -->

    <string name="config_systemVendorIntelligence" translatable="false"></string>

</resources>

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

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ 
    <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_PLATFORM_API_ENABLED)

         @hide @SystemApi -->

    <public name="config_defaultReservedForTestingProfileGroupExclusivity" />

    <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_SYSTEM_VENDOR_INTELLIGENCE_ROLE_ENABLED)

         @hide @SystemApi -->

    <public name="config_systemVendorIntelligence" />

  </staging-public-group>



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