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

Commit e159e12d 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] Allow specifying read/write permissions
  [Catalyst] Provide pid for permission check
parents 9bd11dcf 039a7cee

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

+2 −2
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ abstract class GetPreferenceGraphApiHandler( 


    override suspend fun invoke(

        application: Application,

        myUid: Int,

        callingPid: Int,

        callingUid: Int,

        request: GetPreferenceGraphRequest,

    ): PreferenceGraphProto {

        val builder = PreferenceGraphBuilder.of(application, myUid, callingUid, request)

        val builder = PreferenceGraphBuilder.of(application, callingPid, callingUid, request)

        if (request.screenKeys.isEmpty()) {

            for (key in PreferenceScreenRegistry.preferenceScreens.keys) {

                builder.addPreferenceScreenFromRegistry(key)

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

+4 −4
Original line number Diff line number Diff line
@@ -83,14 +83,14 @@ class PreferenceGetterApiHandler( 


    override fun hasPermission(

        application: Application,

        myUid: Int,

        callingPid: Int,

        callingUid: Int,

        request: PreferenceGetterRequest,

    ) = permissionChecker.hasPermission(application, myUid, callingUid, request)

    ) = permissionChecker.hasPermission(application, callingPid, callingUid, request)



    override suspend fun invoke(

        application: Application,

        myUid: Int,

        callingPid: Int,

        callingUid: Int,

        request: PreferenceGetterRequest,

    ): PreferenceGetterResponse {
@@ -123,7 +123,7 @@ class PreferenceGetterApiHandler( 
                    val preferenceProto =

                        metadata.toProto(

                            application,

                            myUid,

                            callingPid,

                            callingUid,

                            screenMetadata,

                            metadata.key == screenMetadata.key,

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

+31 −14
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.SuppressLint 
import android.content.Context

import android.content.Intent

import android.content.pm.PackageManager

import android.content.pm.PackageManager.PERMISSION_GRANTED

import android.content.res.Configuration

import android.os.Build

import android.os.Bundle
@@ -65,7 +66,7 @@ private const val TAG = "PreferenceGraphBuilder" 
class PreferenceGraphBuilder

private constructor(

    private val context: Context,

    private val myUid: Int,

    private val callingPid: Int,

    private val callingUid: Int,

    private val request: GetPreferenceGraphRequest,

) {
@@ -81,7 +82,7 @@ private constructor( 
        }

    }



    fun build() = builder.build()

    fun build(): PreferenceGraphProto = builder.build()



    /**

     * Adds an activity to the graph.
@@ -268,7 +269,9 @@ private constructor( 
        metadata: PreferenceMetadata,

        isRoot: Boolean,

    ) =

        metadata.toProto(context, myUid, callingUid, screenMetadata, isRoot, request.flags).also {

        metadata

            .toProto(context, callingPid, callingUid, screenMetadata, isRoot, request.flags)

            .also {

                if (metadata is PreferenceScreenMetadata) {

                    @Suppress("CheckReturnValue") addPreferenceScreenMetadata(metadata)

                }
@@ -343,16 +346,16 @@ private constructor( 
    companion object {

        suspend fun of(

            context: Context,

            myUid: Int,

            callingPid: Int,

            callingUid: Int,

            request: GetPreferenceGraphRequest,

        ) = PreferenceGraphBuilder(context, myUid, callingUid, request).also { it.init() }

        ) = PreferenceGraphBuilder(context, callingPid, callingUid, request).also { it.init() }

    }

}



fun PreferenceMetadata.toProto(

    context: Context,

    myUid: Int,

    callingPid: Int,

    callingUid: Int,

    screenMetadata: PreferenceScreenMetadata,

    isRoot: Boolean,
@@ -394,7 +397,7 @@ fun PreferenceMetadata.toProto( 
                (!hasAvailable() || available) &&

                (!hasRestricted() || !restricted) &&

                metadata is PersistentPreference<*> &&

                metadata.getReadPermit(context, myUid, callingUid) == ReadWritePermit.ALLOW

                metadata.evalReadPermit(context, callingPid, callingUid) == ReadWritePermit.ALLOW

        ) {

            value = preferenceValueProto {

                when (metadata) {
@@ -425,6 +428,20 @@ fun PreferenceMetadata.toProto( 
    }

}



/** Evaluates the read permit of a persistent preference. */

fun <T> PersistentPreference<T>.evalReadPermit(

    context: Context,

    callingPid: Int,

    callingUid: Int,

): Int {

    for (permission in getReadPermissions(context)) {

        if (context.checkPermission(permission, callingPid, callingUid) != PERMISSION_GRANTED) {

            return ReadWritePermit.REQUIRE_APP_PERMISSION

        }

    }

    return getReadPermit(context, callingPid, callingUid)

}



private fun PreferenceMetadata.getTitleTextProto(context: Context, isRoot: Boolean): TextProto? {

    if (isRoot && this is PreferenceScreenMetadata) {

        val titleRes = screenTitle

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

+21 −4
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.settingslib.graph



import android.app.Application

import android.content.Context

import android.content.pm.PackageManager.PERMISSION_GRANTED

import android.os.Bundle

import androidx.annotation.IntDef

import com.android.settingslib.graph.proto.PreferenceValueProto
@@ -99,14 +101,14 @@ class PreferenceSetterApiHandler( 


    override fun hasPermission(

        application: Application,

        myUid: Int,

        callingPid: Int,

        callingUid: Int,

        request: PreferenceSetterRequest,

    ) = permissionChecker.hasPermission(application, myUid, callingUid, request)

    ) = permissionChecker.hasPermission(application, callingPid, callingUid, request)



    override suspend fun invoke(

        application: Application,

        myUid: Int,

        callingPid: Int,

        callingUid: Int,

        request: PreferenceSetterRequest,

    ): Int {
@@ -127,7 +129,7 @@ class PreferenceSetterApiHandler( 


        fun <T> PreferenceMetadata.checkWritePermit(value: T): Int {

            @Suppress("UNCHECKED_CAST") val preference = (this as PersistentPreference<T>)

            return when (preference.getWritePermit(application, value, myUid, callingUid)) {

            return when (preference.evalWritePermit(application, value, callingPid, callingUid)) {

                ReadWritePermit.ALLOW -> PreferenceSetterResult.OK

                ReadWritePermit.DISALLOW -> PreferenceSetterResult.DISALLOW

                ReadWritePermit.REQUIRE_APP_PERMISSION ->
@@ -171,6 +173,21 @@ class PreferenceSetterApiHandler( 
        get() = IntMessageCodec

}



/** Evaluates the write permit of a persistent preference. */

fun <T> PersistentPreference<T>.evalWritePermit(

    context: Context,

    value: T?,

    callingPid: Int,

    callingUid: Int,

): Int {

    for (permission in getWritePermissions(context)) {

        if (context.checkPermission(permission, callingPid, callingUid) != PERMISSION_GRANTED) {

            return ReadWritePermit.REQUIRE_APP_PERMISSION

        }

    }

    return getWritePermit(context, value, callingPid, callingUid)

}



/** Message codec for [PreferenceSetterRequest]. */

object PreferenceSetterRequestCodec : MessageCodec<PreferenceSetterRequest> {

    override fun encode(data: PreferenceSetterRequest) =

packages/SettingsLib/Ipc/README.md

+2 −2
Original line number Diff line number Diff line
@@ -101,14 +101,14 @@ object EchoApiImpl : ApiHandler<String?, String?>, 
                     ApiDescriptor<String?, String?> by EchoApi {

  override suspend fun invoke(

    application: Application,

    myUid: Int,

    callingPid: Int,

    callingUid: Int,

    request: String?,

  ): String? = request



  override fun hasPermission(

    application: Application,

    myUid: Int,

    callingPid: Int,

    callingUid: Int,

    request: String?,

  ): Boolean = (request?.length ?: 0) <= 5