Unbreak the public API again... (03cd6765) · Commits · e / os / android_frameworks_base

core/java/android/app/IBatteryService.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ package android.app;
		*
		* {@hide}
		*/

		interface IBatteryService {
		boolean isDockBatterySupported();
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -211,7 +211,11 @@ public class BatteryManager {
		public static final int BATTERY_DOCK_PLUGGED_ANY =
		BATTERY_DOCK_PLUGGED_AC \| BATTERY_DOCK_PLUGGED_USB;

		private final IBatteryService mService;
		private static IBatteryService mService = null;

		public BatteryManager() {
		super();
		}

		/**
		* @hide
		@@ -226,7 +230,7 @@ public class BatteryManager {
		*/
		public boolean isDockBatterySupported() {
		try {
		return mService.isDockBatterySupported();
		return mService != null && mService.isDockBatterySupported();
		} catch (RemoteException ex) {
		// Ignore
		}