OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6322e77
93e7f79
)
Merge changes I93fef3dc,I19647b24
author
Bryce Lee
<brycelee@google.com>
Wed, 15 Nov 2017 15:47:24 +0000
(15:47 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 15 Nov 2017 15:47:24 +0000
(15:47 +0000)
* changes:
Add tests to exercise ActivityStarter precondition failures.
Make ActivityStackSupervisor instrumentable for unit tests.
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
OSDN Git Service
