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

Commit 1020850d authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Restructure camera platform flags 

- Move flags file to frameworks/av and rename it
- Add access to camera platform flags to system service

Test: With dependent patch, verified flag values are logged as expected
Bug: 297375200
Change-Id: I12060e64570e86862f426549d9742aae063ade8a
parent 0b8d3d01

AconfigFlags.bp

+3 −9
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ java_defaults { 
    // Add java_aconfig_libraries to here to add them to the core framework

    srcs: [

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

        ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

        ":camera_platform_flags_core_java_lib{.generated_srcjars}",

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

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

    ],
@@ -34,15 +34,9 @@ java_defaults { 
}



// Camera

aconfig_declarations {

    name: "com.android.hardware.camera2-aconfig",

    package: "com.android.hardware.camera2",

    srcs: ["core/java/android/hardware/camera2/camera_platform.aconfig"],

}



java_aconfig_library {

    name: "com.android.hardware.camera2-aconfig-java",

    aconfig_declarations: "com.android.hardware.camera2-aconfig",

    name: "camera_platform_flags_core_java_lib",

    aconfig_declarations: "camera_platform_flags",

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

}

core/java/android/hardware/camera2/camera_platform.aconfig

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
package: "com.android.hardware.camera2"



flag {

     namespace: "camera_platform"

     name: "initial_test_flag"

     description: "Flag infrastructure test flag"

     bug: "292631208"

}

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ java_library_static { 
        "power_optimization_flags_lib",

        "notification_flags_lib",

        "pm_flags_lib",

        "camera_platform_flags_core_java_lib",

    ],

    javac_shard_size: 50,

    javacflags: [