OSDN Git Service

Merge changes I72119772,I124e4cc0,I462d4dfc into pi-dev
authorChavi Weingarten <chaviw@google.com>
Mon, 19 Mar 2018 17:40:31 +0000 (17:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 Mar 2018 17:40:31 +0000 (17:40 +0000)
commit22ab2b96363c335c8383893357d74c8021669df7
treefb95d3f981a6b0119595a64f2cb910ee49d7670f
parent1b929db32d8e801a7cabbc7fb66915de73e23d34
parent82a0ba843ba2b775a762de4aefb852140f07c3e4
Merge changes I72119772,I124e4cc0,I462d4dfc into pi-dev

* changes:
  Clear all options from Task when any ActivityRecord consumes the options.
  Revert "Set options on startingActivity instead of topActivity"
  Revert "Set options for activity being brought to front."
services/core/java/com/android/server/am/ActivityRecord.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java