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

Commit 671cd655 authored by Jeremy Meyer's avatar Jeremy Meyer Committed by Android (Google) Code Review
Browse files

Merge "Put creation of frro from AssetFileDescriptor behind a flag" into main

parents 3e6dd1b1 ccacdd9f

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11719,7 +11719,7 @@ package android.content.om { 
    method @NonNull public void setResourceValue(@NonNull String, @IntRange(from=android.util.TypedValue.TYPE_FIRST_INT, to=android.util.TypedValue.TYPE_LAST_INT) int, int, @Nullable String);

    method @NonNull public void setResourceValue(@NonNull String, int, @NonNull String, @Nullable String);

    method @NonNull public void setResourceValue(@NonNull String, @NonNull android.os.ParcelFileDescriptor, @Nullable String);

    method @NonNull public void setResourceValue(@NonNull String, @NonNull android.content.res.AssetFileDescriptor, @Nullable String);

    method @FlaggedApi("android.content.res.asset_file_descriptor_frro") @NonNull public void setResourceValue(@NonNull String, @NonNull android.content.res.AssetFileDescriptor, @Nullable String);

    method public void setTargetOverlayable(@Nullable String);

  }

























core/java/android/content/om/FabricatedOverlay.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.content.om;





























import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.IntRange;















import android.annotation.NonNull;










@@ -546,6 +547,7 @@ public class FabricatedOverlay {













     * @param configuration The string representation of the config this overlay is enabled for















     */















    @NonNull













    @FlaggedApi(android.content.res.Flags.FLAG_ASSET_FILE_DESCRIPTOR_FRRO)















    public void setResourceValue(















            @NonNull String resourceName,















            @NonNull AssetFileDescriptor value,

































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



+7
−0




























Original line number
Diff line number
Diff line








@@ -8,3 +8,10 @@ flag {













    # fixed_read_only or device wont boot because of permission issues accessing flags during boot















    is_fixed_read_only: true















}



























flag {













    name: "asset_file_descriptor_frro"













    namespace: "resource_manager"













    description: "Feature flag for passing in an AssetFileDescriptor to create an frro"













    bug: "304478666"













}