OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
59ae42d
)
SystemServer: fix StartIpSecService trace and log
author
Wei Wang
<wvw@google.com>
Wed, 5 Apr 2017 05:00:01 +0000
(22:00 -0700)
committer
Nathan Harold
<nharold@google.com>
Thu, 6 Apr 2017 02:14:34 +0000
(19:14 -0700)
Bug:
36920223
Test: boot and see log
Change-Id: I9b88564ac7eef6998af465b977fa66c7d0787cf2
(cherry picked from commit
90f4c0907e8f746f0f840e76057f84ec20adf46d
)
(cherry picked from commit
75ed75c3d7af90f1b3275a126bdce847adcd7b35
)
services/java/com/android/server/SystemServer.java
patch
|
blob
|
history
diff --git
a/services/java/com/android/server/SystemServer.java
b/services/java/com/android/server/SystemServer.java
index
23ccabd
..
4d5112f
100644
(file)
--- a/
services/java/com/android/server/SystemServer.java
+++ b/
services/java/com/android/server/SystemServer.java
@@
-1024,7
+1024,7
@@
public final class SystemServer {
} catch (Throwable e) {
reportWtf("starting IpSec Service", e);
}
-
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER
);
+
traceEnd(
);
}
if (!disableNonCoreServices && !disableTextServices) {