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

Commit e784c4c6 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Adds sdk_version: "system_current" 

Make Catalyst libraries not depend on private platform APIs, and
get rid of weird NoClassDefFoundError in permission controller tests.

Bug: 420889528
Flag: EXEMPT build file
Test: presubmit&ABTD
Change-Id: Ibfc0520dcd1c2d49db492ea891984093d7719356
parent ba79fb99

packages/SettingsLib/DataStore/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ android_library { 
        "SettingsLibApexDefaults",

        "SettingsLintDefaults",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    srcs: ["src/**/*.kt"],

    static_libs: [

packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsGlobalStore.kt

+1 −2
Original line number Diff line number Diff line
@@ -86,9 +86,8 @@ class SettingsGlobalStore private constructor(contentResolver: ContentResolver) 
                }



        @VisibleForTesting

        fun reset() {

        fun resetInstance() {

            instance = null

            Global.clearProviderForTest()

        }



        /** Returns the required permissions to read [Global] settings. */

packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSecureStore.kt

+1 −2
Original line number Diff line number Diff line
@@ -86,9 +86,8 @@ class SettingsSecureStore private constructor(contentResolver: ContentResolver) 
                }



        @VisibleForTesting

        fun reset() {

        fun resetInstance() {

            instance = null

            Secure.clearProviderForTest()

        }



        /** Returns the required permissions to read [Secure] settings. */

packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsSystemStore.kt

+1 −2
Original line number Diff line number Diff line
@@ -86,9 +86,8 @@ class SettingsSystemStore private constructor(contentResolver: ContentResolver) 
                }



        @VisibleForTesting

        fun reset() {

        fun resetInstance() {

            instance = null

            System.clearProviderForTest()

        }



        /** Returns the required permissions to read [System] settings. */

packages/SettingsLib/Metadata/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ android_library { 
        "SettingsLibApexDefaults",

        "SettingsLintDefaults",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    srcs: ["src/**/*.kt"],

    static_libs: [