Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of a06ad953 to master

Browse Source 
Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
This commit is contained in:
Chung-yih Wang
2010-08-06 12:06:04 +08:00
parent b423dac932 a06ad953a2
commit 024d59601e
7 changed files with 2852 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/SystemServer.java
View File

@@ -17,6 +17,7 @@
package com.android.server;
import com.android.server.am.ActivityManagerService;
import com.android.server.sip.SipService;
import com.android.internal.os.BinderInternal;
import com.android.internal.os.SamplingProfilerIntegration;
@@ -428,6 +429,13 @@ class ServerThread extends Thread {
} catch (Throwable e) {
Slog.e(TAG, "Failure starting SamplingProfiler Service", e);
}
try {
Slog.i(TAG, "Sip Service");
ServiceManager.addService("sip", new SipService(context));
} catch (Throwable e) {
Slog.e(TAG, "Failure starting SIP Service", e);
}
}
// make sure the ADB_ENABLED setting value matches the secure property value