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

Commit b8811985 authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Add INTERACT_ACROSS_USERS to WMShell" into sc-dev am: 0cc4fd9d 

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

Change-Id: I9e7a6233274e13277bede1885780565a58a846ec
parents bde42f87 0cc4fd9d

data/etc/car/com.android.car.carlauncher.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    <privapp-permissions package="com.android.car.carlauncher">

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

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

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

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

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

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

libs/WindowManager/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


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

    package="com.android.wm.shell">

    <!-- System permission required by WM Shell Task Organizer. -->

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

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

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

</manifest>