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

Commit 6f53cbb4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add permission for protecting UI tracing" am: 854bb5b5 

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

Change-Id: I514e00e6737d06d3e38e19ab62b44b8a3c35208f
parents b0b08331 854bb5b5

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -3032,6 +3032,12 @@ 
    <permission android:name="android.permission.DUMP"

        android:protectionLevel="signature|privileged|development" />



    <!-- Allows an application to start tracing for InputMethod and WindowManager.

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

    @hide -->

    <permission android:name="android.permission.CONTROL_UI_TRACING"

        android:protectionLevel="signature|privileged|development" />



    <!-- Allows an application to read the low-level system log files.

    <p>Not for use by third-party applications, because

    Log entries can contain the user's private information. -->

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ applications that come with the platform 
        <permission name="android.permission.DELETE_CACHE_FILES"/>

        <permission name="android.permission.DELETE_PACKAGES"/>

        <permission name="android.permission.DUMP"/>

        <permission name="android.permission.CONTROL_UI_TRACING"/>

        <permission name="android.permission.ACTIVITY_EMBEDDING"/>

        <permission name="android.permission.FORCE_STOP_PACKAGES"/>

        <permission name="android.permission.GET_APP_OPS_STATS"/>

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
    <uses-permission android:name="android.permission.SET_PROCESS_LIMIT" />

    <uses-permission android:name="android.permission.SET_ALWAYS_FINISH" />

    <uses-permission android:name="android.permission.DUMP" />

    <uses-permission android:name="android.permission.CONTROL_UI_TRACING" />

    <uses-permission android:name="android.permission.SIGNAL_PERSISTENT_PROCESSES" />

    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />

    <!-- Internal permissions granted to the shell. -->