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

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

Merge "[Catalyst] Include required read/write permissions in graph" into main

parents 781d348b 4f471b66

packages/SettingsLib/Graph/graph.proto

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ message PreferenceProto { 
  optional PreferenceValueDescriptorProto value_descriptor = 15;

  // Indicate how sensitive of the preference.

  optional int32 sensitivity_level = 16;

  // The required permissions to read preference value.

  repeated string read_permissions = 17;

  // The required permissions to write preference value.

  repeated string write_permissions = 18;



  // Target of an Intent

  message ActionTarget {

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

+7 −1
Original line number Diff line number Diff line
@@ -391,7 +391,13 @@ fun PreferenceMetadata.toProto( 
    }

    persistent = metadata.isPersistent(context)

    if (persistent) {

        if (metadata is PersistentPreference<*>) sensitivityLevel = metadata.sensitivityLevel

        if (metadata is PersistentPreference<*>) {

            sensitivityLevel = metadata.sensitivityLevel

            val readPermissions = metadata.getReadPermissions(context)

            readPermissions.forEach { addReadPermissions(it) }

            val writePermissions = metadata.getWritePermissions(context)

            writePermissions.forEach { addWritePermissions(it) }

        }

        if (

            flags.includeValue() &&

                enabled &&