OSDN Git Service

Merge "Wait to pause activity if translucent activity is waiting."
authorBryce Lee <brycelee@google.com>
Fri, 2 Mar 2018 23:22:25 +0000 (23:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Mar 2018 23:22:25 +0000 (23:22 +0000)
commit9055c1b6afc2b1afc7b3bb112d994572f858a216
treec45f96bdfb2f939d1b4b6c3d556f4921490cd4f5
parente51234b4488c5cb06ae9fb9b7418b3d06516dc69
parenta0fb8e03b04759fca82428e7ad70c2832cb94d73
Merge "Wait to pause activity if translucent activity is waiting."
services/core/java/com/android/server/am/ActivityRecord.java
services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java