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

Commit 58cfb235 authored by Mark Punzalan's avatar Mark Punzalan Committed by Android (Google) Code Review
Browse files

Merge "Add `featureFlag` manifest attribute" into main

parents fc6ecfa6 05322204

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ package android { 














  public static final class R.attr {















    field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600













    field @FlaggedApi("android.content.res.manifest_flagging") public static final int featureFlag;















    field public static final int gameSessionService = 16844373; // 0x1010655















    field public static final int hotwordDetectionService = 16844326; // 0x1010626















    field @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public static final int isVirtualDeviceOnly;

























core/res/res/values/attrs_manifest.xml



+6
−0




























Original line number
Diff line number
Diff line








@@ -1813,6 +1813,12 @@





























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





























    <!-- This attribute can be applied to any tag in the manifest. The system uses its value to













         determine whether the element (e.g., a permission) should be enabled or disabled













         depending on the state of feature flags.













         @hide @SystemApi @FlaggedApi("android.content.res.manifest_flagging") -->













    <attr name="featureFlag" format="string" />





























    <!-- The <code>manifest</code> tag is the root of an















         <code>AndroidManifest.xml</code> file,















         describing the contents of an Android package (.apk) file.  One

































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



+2
−0




























Original line number
Diff line number
Diff line








@@ -119,6 +119,8 @@













    <public name="optional"/>















    <!-- @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") -->















    <public name="adServiceTypes" />













    <!-- @hide @SystemApi @FlaggedApi("android.content.res.manifest_flagging") -->













    <public name="featureFlag"/>















  </staging-public-group>































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