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

Commit e0b8a315 authored by Carlos Martinez Romero's avatar Carlos Martinez Romero
Browse files

Add a flag to a previous API change. 

This was changed recently b/216813597 and at that point it should have
been behind a flag.

Bug: 304478551
Test: it builds fine?
Change-Id: I21912cc463632ec867b50c7100b6a50222d9f771
parent 7a740774

AconfigFlags.bp

+8 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ aconfig_srcjars = [ 
    ":sdk_sandbox_flags_lib{.generated_srcjars}",

    ":sdk_sandbox_flags_lib{.generated_srcjars}",

    ":android.permission.flags-aconfig-java{.generated_srcjars}",

    ":android.permission.flags-aconfig-java{.generated_srcjars}",

    ":hwui_flags_java_lib{.generated_srcjars}",

    ":hwui_flags_java_lib{.generated_srcjars}",

    ":framework_graphics_flags_java_lib{.generated_srcjars}",

    ":display_flags_lib{.generated_srcjars}",

    ":display_flags_lib{.generated_srcjars}",

    ":android.multiuser.flags-aconfig-java{.generated_srcjars}",

    ":android.multiuser.flags-aconfig-java{.generated_srcjars}",

    ":android.app.flags-aconfig-java{.generated_srcjars}",

    ":android.app.flags-aconfig-java{.generated_srcjars}",
@@ -333,6 +334,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

}





java_aconfig_library {

    name: "framework_graphics_flags_java_lib",

    aconfig_declarations: "framework_graphics_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Display

// Display

java_aconfig_library {

java_aconfig_library {

    name: "display_flags_lib",

    name: "display_flags_lib",
@@ -424,7 +431,7 @@ aconfig_declarations { 
    package: "android.service.autofill",

    package: "android.service.autofill",

    srcs: [

    srcs: [

        "services/autofill/bugfixes.aconfig",

        "services/autofill/bugfixes.aconfig",

        "services/autofill/features.aconfig"

        "services/autofill/features.aconfig",

    ],

    ],

}

}

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -16303,7 +16303,7 @@ package android.graphics { 
    method public void arcTo(float, float, float, float, float, float, boolean);

    method public void arcTo(float, float, float, float, float, float, boolean);

    method public void close();

    method public void close();

    method @Deprecated public void computeBounds(@NonNull android.graphics.RectF, boolean);

    method @Deprecated public void computeBounds(@NonNull android.graphics.RectF, boolean);

    method public void computeBounds(@NonNull android.graphics.RectF);

    method @FlaggedApi("com.android.graphics.flags.exact_compute_bounds") public void computeBounds(@NonNull android.graphics.RectF);

    method public void conicTo(float, float, float, float, float);

    method public void conicTo(float, float, float, float, float);

    method public void cubicTo(float, float, float, float, float, float);

    method public void cubicTo(float, float, float, float, float, float);

    method @NonNull public android.graphics.Path.FillType getFillType();

    method @NonNull public android.graphics.Path.FillType getFillType();

graphics/java/Android.bp

+6 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,12 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

    default_applicable_licenses: ["frameworks_base_license"],

}

}





aconfig_declarations {

    name: "framework_graphics_flags",

    package: "com.android.graphics.flags",

    srcs: ["android/framework_graphics.aconfig"],

}



filegroup {

filegroup {

    name: "framework-graphics-nonupdatable-sources",

    name: "framework-graphics-nonupdatable-sources",

    srcs: [

    srcs: [

graphics/java/android/framework_graphics.aconfig

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
package: "com.android.graphics.flags"



flag {

     name: "exact_compute_bounds"

     namespace: "framework_graphics"

     description: "Add a function without unused exact param for computeBounds."

     bug: "304478551"

}
 
 No newline at end of file

graphics/java/android/graphics/Path.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -16,11 +16,14 @@ 




package android.graphics;

package android.graphics;





import android.annotation.FlaggedApi;

import android.annotation.FloatRange;

import android.annotation.FloatRange;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.Size;

import android.annotation.Size;





import com.android.graphics.flags.Flags;



import dalvik.annotation.optimization.CriticalNative;

import dalvik.annotation.optimization.CriticalNative;

import dalvik.annotation.optimization.FastNative;

import dalvik.annotation.optimization.FastNative;
@@ -309,6 +312,7 @@ public class Path { 
     *

     *

     * @param bounds Returns the computed bounds of the path's control points.

     * @param bounds Returns the computed bounds of the path's control points.

     */

     */

    @FlaggedApi(Flags.FLAG_EXACT_COMPUTE_BOUNDS)

    public void computeBounds(@NonNull RectF bounds) {

    public void computeBounds(@NonNull RectF bounds) {

        nComputeBounds(mNativePath, bounds);

        nComputeBounds(mNativePath, bounds);

    }

    }