Commit 6c5b2b4a authored May 13, 2016 by Andreas Gampe Committed by android-build-merger May 13, 2016

Merge "System server: Add Bluetooth to native processes" into nyc-dev am: 3264b607

am: 9f768c34

* commit '9f768c34':
  System server: Add Bluetooth to native processes

Change-Id: I20c48c3dfdbbbf7cf89484ad2ea0f6dafa2ec21d

services/core/java/com/android/server/Watchdog.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ public class Watchdog extends Thread {
		"/system/bin/surfaceflinger",
		"media.codec", // system/bin/mediacodec
		"media.extractor", // system/bin/mediaextractor
		"com.android.bluetooth", // Bluetooth service
		};

		static Watchdog sWatchdog;