OSDN Git Service

Disallow entering PiP when activity is locked.
authorWinson Chung <winsonc@google.com>
Mon, 30 Jan 2017 20:01:45 +0000 (12:01 -0800)
committerWinson Chung <winsonc@google.com>
Wed, 1 Feb 2017 19:12:06 +0000 (11:12 -0800)
commitbb348802d3aa3880bf6ad119dfd980cd93b05a38
treeb95051a14ec229154c49c532c94fdc5c776eca29
parent4dabf2396f4fe18b2f83641fe2ac52a913763bad
Disallow entering PiP when activity is locked.

- Also ensuring that when we request for a task to be locked
  via the shell, we directly set the locked state instead of
  relying on the SystemUI to show a prompt to lock (necessary
  for the CTS test to run).

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testDisallowEnterPipActivityLocked

Change-Id: Ice608e6d8e7f018dbd5e20ae457343bfdd0a8630
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
services/core/java/com/android/server/am/ActivityRecord.java