Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't allow activites on virtual displays" into rvc-dev am: b79905f0af

Browse Source 
Change-Id: If2a20d4c050bae15b451a4900125e8fae989492e
This commit is contained in:
Linus Tufvesson
2020-05-01 11:01:49 +00:00
committed by Automerger Merge Worker
parent d4e7c5d34f b79905f0af
commit b256a22a87
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityStackSupervisor.java
View File

@@ -1092,8 +1092,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
final boolean uidPresentOnDisplay = displayContent.isUidPresent(callingUid);
final int displayOwnerUid = displayContent.mDisplay.getOwnerUid();
if (displayContent.mDisplay.getType() == TYPE_VIRTUAL && displayOwnerUid != SYSTEM_UID
&& displayOwnerUid != aInfo.applicationInfo.uid) {
if (displayContent.mDisplay.getType() == TYPE_VIRTUAL && displayOwnerUid != SYSTEM_UID) {
// Limit launching on virtual displays, because their contents can be read from Surface
// by apps that created them.
if ((aInfo.flags & ActivityInfo.FLAG_ALLOW_EMBEDDED) == 0) {

1
services/tests/wmtests/Android.bp
View File

@@ -25,6 +25,7 @@ android_test {
"testables",
"ub-uiautomator",
"hamcrest-library",
"compatibility-device-util-axt",
],
libs: [

2
services/tests/wmtests/AndroidManifest.xml
View File

@@ -55,7 +55,7 @@
<activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityInActivityView"
android:resizeableActivity="true" />
<activity android:name="com.android.server.wm.ScreenDecorWindowTests$TestActivity"
android:showWhenLocked="true" />
android:showWhenLocked="true" android:allowEmbedded="true"/>
</application>
<instrumentation

7
services/tests/wmtests/src/com/android/server/wm/ScreenDecorWindowTests.java
View File

@@ -64,6 +64,8 @@ import android.widget.TextView;
import androidx.test.filters.SmallTest;
import com.android.compatibility.common.util.SystemUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -343,7 +345,10 @@ public class ScreenDecorWindowTests {
intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
final ActivityOptions options = ActivityOptions.makeBasic();
options.setLaunchDisplayId(displayId);
final Activity activity = mInstrumentation.startActivitySync(intent, options.toBundle());
final Activity activity = SystemUtil.runWithShellPermissionIdentity(
() -> mInstrumentation.startActivitySync(intent, options.toBundle()),
"android.permission.ACTIVITY_EMBEDDING");
waitForIdle();
assertEquals(displayId, activity.getDisplayId());