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

Commit 605c86a4 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Add permission to launch activities on VD" into oc-mr1-dev 

am: bfa0ed51

Change-Id: Ibab6739ed668f0d378aa87e2cffb5c9daa17291d
parents f880d1f9 bfa0ed51

api/system-current.txt

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

    field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";

    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";

    field public static final java.lang.String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";

    field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";

    field public static final java.lang.String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";

    field public static final java.lang.String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK";

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1859,6 +1859,10 @@ 
    <permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows an application to embed other activities -->

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

                android:protectionLevel="signature|privileged" />



    <!-- Allows an application to start any activity, regardless of permission

         protection or exported state.

         @hide -->

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,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.ACTIVITY_EMBEDDING"/>

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

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

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

packages/Shell/AndroidManifest.xml

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

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

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

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

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

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

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

services/core/java/com/android/server/am/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
     */

    boolean canBeLaunchedOnDisplay(int displayId) {

        return service.mStackSupervisor.canPlaceEntityOnDisplay(displayId,

                supportsResizeableMultiWindow());

                supportsResizeableMultiWindow(), launchedFromPid, launchedFromUid, info);

    }



    /**