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:
1fef349
ea600f9
)
Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down....
author
Nicolas Prévot
<nprevot@google.com>
Wed, 22 Jun 2016 12:36:45 +0000
(12:36 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 22 Jun 2016 12:36:45 +0000
(12:36 +0000)
am:
ea600f9a12
Change-Id: I1b43aabc35b45558c90750cab7314b63ae8d4b60
1
2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/UserController.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/pm/UserManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
diff --cc
services/core/java/com/android/server/am/UserController.java
Simple merge
diff --cc
services/core/java/com/android/server/pm/UserManagerService.java
Simple merge