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

resolved conflicts for merge of f4c3b7e9 to master

Browse Source 
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
This commit is contained in:
Nick Pelly
2010-09-29 12:20:51 -07:00
parent 856f2859e8 f4c3b7e916
commit 4715bd91f5
44 changed files with 6762 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.server;
import com.android.server.am.ActivityManagerService;
import com.android.internal.os.BinderInternal;
import com.android.internal.os.SamplingProfilerIntegration;
import com.trustedlogic.trustednfc.android.server.NfcService;
import dalvik.system.VMRuntime;
import dalvik.system.Zygote;
@@ -44,6 +45,7 @@ import android.server.BluetoothA2dpService;
import android.server.BluetoothService;
import android.server.search.SearchManagerService;
import android.util.EventLog;
import android.util.Log;
import android.util.Slog;
import java.io.File;
@@ -413,6 +415,20 @@ class ServerThread extends Thread {
} catch (Throwable e) {
Slog.e(TAG, "Failure starting Recognition Service", e);
}
try {
Slog.i(TAG, "Nfc Service");
NfcService nfc;
try {
nfc = new NfcService(context);
} catch (UnsatisfiedLinkError e) { // gross hack to detect NFC
nfc = null;
Slog.w(TAG, "No NFC support");
}
ServiceManager.addService(Context.NFC_SERVICE, nfc);
} catch (Throwable e) {
Slog.e(TAG, "Failure starting NFC Service", e);
}
try {
Slog.i(TAG, "DiskStats Service");