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

Commit 5759a990 authored by Hawkwood's avatar Hawkwood
Browse files

Ensure we keep all clock plugin classes 

Bug: 410481244
Flag: NONE Bugfix
Test: Manually checked crash on -userdebug
Change-Id: Ie41b04700a022193c514a140791c36216f6419af
parent 9ce661ac

packages/SystemUI/customization/Android.bp

+9 −4
Original line number Diff line number Diff line
@@ -26,20 +26,20 @@ android_library { 
    name: "SystemUICustomizationLib",

    use_resource_processor: true,

    srcs: [

        "src/**/*.aidl",

        "src/**/*.java",

        "src/**/*.kt",

        "src/**/*.aidl",

    ],

    static_libs: [

        "PlatformAnimationLib",

        "PluginCoreLib",

        "SystemUIClocks-CommonLib",

        "SystemUIPluginLib",

        "SystemUIUnfoldLib",

        "kotlinx_coroutines",

        "monet",

        "dagger2",

        "jsr330",

        "SystemUIClocks-CommonLib",

        "kotlinx_coroutines",

        "monet",

    ],

    libs: [

        // Keep android-specific libraries as libs instead of static_libs, so that they don't break
@@ -55,4 +55,9 @@ android_library { 
    min_sdk_version: "current",

    plugins: ["dagger2-compiler"],

    kotlincflags: ["-Xjvm-default=all"],



    optimize: {

        proguard_flags_files: ["proguard_customization.flags"],

        export_proguard_flags_files: true,

    },

}

packages/SystemUI/customization/clocks/common/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -53,4 +53,8 @@ android_library { 
    min_sdk_version: "current",

    plugins: ["dagger2-compiler"],

    kotlincflags: ["-Xjvm-default=all"],

    optimize: {

        proguard_flags_files: ["proguard_clocks.flags"],

        export_proguard_flags_files: true,

    },

}

packages/SystemUI/customization/clocks/common/proguard_clocks.flags

0 → 100644
+5 −0
Original line number Diff line number Diff line 
-include ../../../proguard_kotlin.flags



-keepclassmembers class androidx.constraintlayout.widget.ConstraintSet { public *; }

-keepclassmembers class androidx.constraintlayout.widget.ConstraintSet$* { public *; }

-keepclassmembers class com.android.systemui.customization.clocks.R$* { public static <fields>; }

packages/SystemUI/customization/proguard_customization.flags

0 → 100644
+1 −0
Original line number Diff line number Diff line 
-include ../proguard_kotlin.flags

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockConfig.kt

+4 −0
Original line number Diff line number Diff line
@@ -13,11 +13,14 @@ 
 */

package com.android.systemui.plugins.clocks



import com.android.internal.annotations.Keep



/**

 * Exposes the rendering capabilities of this clock to SystemUI so that it can be hosted and render

 * correctly in SystemUI's process. Ideally all clocks could be rendered identically, but in

 * practice we different clocks require different behavior from SystemUI.

 */

@Keep

data class ClockConfig(

    val id: ClockId,
@@ -35,6 +38,7 @@ data class ClockConfig( 
)



/** Render configuration options for a specific clock face. */

@Keep

data class ClockFaceConfig(

    /** Expected interval between calls to onTimeTick. Can always reduce to PER_MINUTE in AOD. */

    val tickRate: ClockTickRate = ClockTickRate.PER_MINUTE,