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

Commit 48237df9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "catalyst" into main 

* changes:
  [Catalyst] Specify return type to fix Android Studio warnings
  [Catalyst] Add read/write permissions for settings store
parents feefc3db 3d3be56c

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

+6 −0
Original line number Diff line number Diff line
@@ -82,5 +82,11 @@ class SettingsGlobalStore private constructor(contentResolver: ContentResolver) 
                            instance = it

                        }

                }



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

        fun getReadPermissions() = arrayOf<String>()



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

        fun getWritePermissions() = arrayOf<String>()

    }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settingslib.datastore



import android.Manifest

import android.content.ContentResolver

import android.content.Context

import android.net.Uri
@@ -82,5 +83,11 @@ class SettingsSecureStore private constructor(contentResolver: ContentResolver) 
                            instance = it

                        }

                }



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

        fun getReadPermissions() = arrayOf<String>()



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

        fun getWritePermissions() = arrayOf(Manifest.permission.WRITE_SECURE_SETTINGS)

    }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settingslib.datastore



import android.Manifest

import android.content.ContentResolver

import android.content.Context

import android.net.Uri
@@ -82,5 +83,11 @@ class SettingsSystemStore private constructor(contentResolver: ContentResolver) 
                            instance = it

                        }

                }



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

        fun getReadPermissions() = arrayOf<String>()



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

        fun getWritePermissions() = arrayOf(Manifest.permission.WRITE_SETTINGS)

    }

}

packages/SettingsLib/Graph/src/com/android/settingslib/graph/ProtoDsl.kt

+23 −17
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ val PreferenceScreenProto.rootOrNull 


/** Kotlin DSL-style builder for [PreferenceScreenProto]. */

@JvmSynthetic

inline fun preferenceScreenProto(init: PreferenceScreenProto.Builder.() -> Unit) =

    PreferenceScreenProto.newBuilder().also(init).build()

inline fun preferenceScreenProto(

    init: PreferenceScreenProto.Builder.() -> Unit

): PreferenceScreenProto = PreferenceScreenProto.newBuilder().also(init).build()



/** Returns preference or null. */

val PreferenceOrGroupProto.preferenceOrNull
@@ -48,8 +49,9 @@ val PreferenceOrGroupProto.groupOrNull 


/** Kotlin DSL-style builder for [PreferenceOrGroupProto]. */

@JvmSynthetic

inline fun preferenceOrGroupProto(init: PreferenceOrGroupProto.Builder.() -> Unit) =

    PreferenceOrGroupProto.newBuilder().also(init).build()

inline fun preferenceOrGroupProto(

    init: PreferenceOrGroupProto.Builder.() -> Unit

): PreferenceOrGroupProto = PreferenceOrGroupProto.newBuilder().also(init).build()



/** Returns preference or null. */

val PreferenceGroupProto.preferenceOrNull
@@ -57,8 +59,9 @@ val PreferenceGroupProto.preferenceOrNull 


/** Kotlin DSL-style builder for [PreferenceGroupProto]. */

@JvmSynthetic

inline fun preferenceGroupProto(init: PreferenceGroupProto.Builder.() -> Unit) =

    PreferenceGroupProto.newBuilder().also(init).build()

inline fun preferenceGroupProto(

    init: PreferenceGroupProto.Builder.() -> Unit

): PreferenceGroupProto = PreferenceGroupProto.newBuilder().also(init).build()



/** Returns title or null. */

val PreferenceProto.titleOrNull
@@ -74,7 +77,7 @@ val PreferenceProto.actionTargetOrNull 


/** Kotlin DSL-style builder for [PreferenceProto]. */

@JvmSynthetic

inline fun preferenceProto(init: PreferenceProto.Builder.() -> Unit) =

inline fun preferenceProto(init: PreferenceProto.Builder.() -> Unit): PreferenceProto =

    PreferenceProto.newBuilder().also(init).build()



/** Returns intent or null. */
@@ -83,39 +86,42 @@ val ActionTarget.intentOrNull 


/** Kotlin DSL-style builder for [ActionTarget]. */

@JvmSynthetic

inline fun actionTargetProto(init: ActionTarget.Builder.() -> Unit) =

inline fun actionTargetProto(init: ActionTarget.Builder.() -> Unit): ActionTarget =

    ActionTarget.newBuilder().also(init).build()



/** Kotlin DSL-style builder for [PreferenceValueProto]. */

@JvmSynthetic

inline fun preferenceValueProto(init: PreferenceValueProto.Builder.() -> Unit) =

    PreferenceValueProto.newBuilder().also(init).build()

inline fun preferenceValueProto(

    init: PreferenceValueProto.Builder.() -> Unit

): PreferenceValueProto = PreferenceValueProto.newBuilder().also(init).build()



/** Kotlin DSL-style builder for [PreferenceValueDescriptorProto]. */

@JvmSynthetic

inline fun preferenceValueDescriptorProto(init: PreferenceValueDescriptorProto.Builder.() -> Unit) =

    PreferenceValueDescriptorProto.newBuilder().also(init).build()

inline fun preferenceValueDescriptorProto(

    init: PreferenceValueDescriptorProto.Builder.() -> Unit

): PreferenceValueDescriptorProto = PreferenceValueDescriptorProto.newBuilder().also(init).build()



/** Kotlin DSL-style builder for [RangeValueProto]. */

@JvmSynthetic

inline fun rangeValueProto(init: RangeValueProto.Builder.() -> Unit) =

inline fun rangeValueProto(init: RangeValueProto.Builder.() -> Unit): RangeValueProto =

    RangeValueProto.newBuilder().also(init).build()



/** Kotlin DSL-style builder for [TextProto]. */

@JvmSynthetic

inline fun textProto(init: TextProto.Builder.() -> Unit) = TextProto.newBuilder().also(init).build()

inline fun textProto(init: TextProto.Builder.() -> Unit): TextProto =

    TextProto.newBuilder().also(init).build()



/** Kotlin DSL-style builder for [IntentProto]. */

@JvmSynthetic

inline fun intentProto(init: IntentProto.Builder.() -> Unit) =

inline fun intentProto(init: IntentProto.Builder.() -> Unit): IntentProto =

    IntentProto.newBuilder().also(init).build()



/** Kotlin DSL-style builder for [BundleProto]. */

@JvmSynthetic

inline fun bundleProto(init: BundleProto.Builder.() -> Unit) =

inline fun bundleProto(init: BundleProto.Builder.() -> Unit): BundleProto =

    BundleProto.newBuilder().also(init).build()



/** Kotlin DSL-style builder for [BundleValue]. */

@JvmSynthetic

inline fun bundleValueProto(init: BundleValue.Builder.() -> Unit) =

inline fun bundleValueProto(init: BundleValue.Builder.() -> Unit): BundleValue =

    BundleValue.newBuilder().also(init).build()