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

Commit 24ad325b authored by Colin Cross's avatar Colin Cross
Browse files

Remove SettingsLib from Telecom 

SettingsLib is no longer used, and pulls in androidx which causes
issues with unexpectected ContentProviders.  Remove it, and add
androidx.annotation_annotation and a definition of strings/cancel
instead.

Test: m Telecom
Change-Id: Iadd9827ec569a3dcf5b812aa4bf4377f74603e02
parent 8e62f9d9

Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ android_app { 
        ":Telecom-srcs",

        "proto/**/*.proto",

    ],

    static_libs: [

        "androidx.annotation_annotation",

    ],

    resource_dirs: ["res"],

    proto: {

        type: "nano",
@@ -37,7 +40,6 @@ android_app { 
    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

    defaults: ["SettingsLibDefaults"],

}



android_test {

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -373,4 +373,6 @@ 
         blocking functionality (for test purposes).

         DO NOT TRANSLATE -->

    <string name="developer_enhanced_call_blocking" translatable="false">Enhanced Call Blocking</string>

    <!-- Button label for generic cancel action [CHAR LIMIT=20] -->

    <string name="cancel">Cancel</string>

</resources>