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:
1eff922
84730a0
)
Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev
author
Bryce Lee
<brycelee@google.com>
Wed, 11 Apr 2018 17:00:26 +0000
(17:00 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 11 Apr 2018 17:00:26 +0000
(17:00 +0000)
1
2
services/core/java/com/android/server/am/ActivityRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStack.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/TaskRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStack.java
Simple merge
diff --cc
services/core/java/com/android/server/am/TaskRecord.java
Simple merge