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

Commit 9a026b26 authored by Tony Huang's avatar Tony Huang
Browse files

Use exist sf aconfig flag for display small area feature 

Replace duplicate created flags under display_flags for small area
detection feature to already exist sf flag.

Bug: 298722189
Test: build
Change-Id: Ia819adfb439d5f88a4c329069838726396bcd695
parent 2e8974e2

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ aconfig_srcjars = [ 
    ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",

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

    ":device_policy_aconfig_flags_lib{.generated_srcjars}",

    ":surfaceflinger_flags_java_lib{.generated_srcjars}",

]



filegroup {
@@ -627,3 +628,10 @@ java_aconfig_library { 
    aconfig_declarations: "android.app.smartspace.flags-aconfig",

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

}



// SurfaceFlinger

java_aconfig_library {

    name: "surfaceflinger_flags_java_lib",

    aconfig_declarations: "surfaceflinger_flags",

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

}

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ public class DisplayManagerFlags { 
            Flags::enablePowerThrottlingClamper);



    private final FlagState mSmallAreaDetectionFlagState = new FlagState(

            Flags.FLAG_ENABLE_SMALL_AREA_DETECTION,

            Flags::enableSmallAreaDetection);

            com.android.graphics.surfaceflinger.flags.Flags.FLAG_ENABLE_SMALL_AREA_DETECTION,

            com.android.graphics.surfaceflinger.flags.Flags::enableSmallAreaDetection);



    /** Returns whether connected display management is enabled or not. */

    public boolean isConnectedDisplayManagementEnabled() {

services/core/java/com/android/server/display/feature/display_flags.aconfig

+0 −9
Original line number Diff line number Diff line
@@ -104,12 +104,3 @@ flag { 
    bug: "211737588"

    is_fixed_read_only: true

}
 


flag {

    name: "enable_small_area_detection"

    namespace: "display_manager"

    description: "Feature flag for SmallAreaDetection"

    bug: "298722189"

    is_fixed_read_only: true

}