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

Commit c88cf9f4 authored by Nadia Agueeva's avatar Nadia Agueeva Committed by Automerger Merge Worker
Browse files

Merge "Fix a typo." into main am: 034f11bb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2957033



Change-Id: I58047aef85883c0a7e00f0dd4d712ce8c28c83a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15dc62b5 034f11bb

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -5810,7 +5810,7 @@ 
    <permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"

        android:protectionLevel="signature|privileged" />



    <!-- Allows an application to collect usage infomation about brightness slider changes.

    <!-- Allows an application to collect usage information about brightness slider changes.

         <p>Not for use by third-party applications.</p>

         @hide

         @SystemApi

core/res/res/layout/app_perms_summary.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<!-- Describes permission item consisting of a group name and the list of permisisons under the group -->

<!-- Describes permission item consisting of a group name and the list of permissions under the group -->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"