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

Commit 058ac1b7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove MODIFY_TOUCH_MODE_STATE from SystemApi" into tm-dev am: 286aed55 

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

Change-Id: I5376574b853a8b7df1b516ffd0b4ba9f9e5d56a4
parents 2cff0725 286aed55

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ package android { 
    field public static final String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";

    field public static final String MODIFY_QUIET_MODE = "android.permission.MODIFY_QUIET_MODE";

    field public static final String MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE = "android.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE";

    field public static final String MODIFY_TOUCH_MODE_STATE = "android.permission.MODIFY_TOUCH_MODE_STATE";

    field public static final String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE";

    field public static final String NETWORK_AIRPLANE_MODE = "android.permission.NETWORK_AIRPLANE_MODE";

    field public static final String NETWORK_CARRIER_PROVISIONING = "android.permission.NETWORK_CARRIER_PROVISIONING";

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -4718,7 +4718,7 @@ 
    <permission android:name="android.permission.READ_FRAME_BUFFER"

        android:protectionLevel="signature|recents" />



      <!-- @SystemApi Allows an application to change the touch mode state.

      <!-- Allows an application to change the touch mode state.

           Without this permission, an app can only change the touch mode

           if it currently has focus.

           @hide -->