Commit 69689a7
committed
DO NOT MERGE Push event logging down into libcore.EventLogger
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.
Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8
Conflicts:
core/java/android/app/ActivityThread.java1 parent 7c65e39 commit 69689a7
1 file changed
+11
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| 112 | + | |
112 | 113 | | |
113 | 114 | | |
114 | 115 | | |
| |||
4870 | 4871 | | |
4871 | 4872 | | |
4872 | 4873 | | |
| 4874 | + | |
| 4875 | + | |
| 4876 | + | |
| 4877 | + | |
| 4878 | + | |
| 4879 | + | |
| 4880 | + | |
4873 | 4881 | | |
4874 | 4882 | | |
4875 | 4883 | | |
| |||
4880 | 4888 | | |
4881 | 4889 | | |
4882 | 4890 | | |
| 4891 | + | |
| 4892 | + | |
| 4893 | + | |
4883 | 4894 | | |
4884 | 4895 | | |
4885 | 4896 | | |
| |||
0 commit comments