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:
adf522b
4026cae
)
Merge "Push the device owner packageName from DPMS to ATMS instead of calling DPM...
author
Michal Karpinski
<mkarpinski@google.com>
Tue, 12 Feb 2019 14:55:04 +0000
(14:55 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 12 Feb 2019 14:55:04 +0000
(14:55 +0000)
1
2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
Simple merge
diff --cc
services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
Simple merge