From 57838d665f647273eca9b4d2d2cf996c27e76628 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Tue, 26 Sep 2017 14:27:24 -0700
Subject: [PATCH] vold: remove unnecessary dependency on libbatteryservice.

Battery check could be replaced by hwbinder calls into
android.hardware.health@2.0 instead, but because
of b/16868177, this is actually not needed.

Bug: 62229583
Test: pass
Change-Id: Ieb03e6ee2f648d9c1d85dbbdc10626726f5fe39b
---
 Android.mk       | 1 -
 CheckBattery.cpp | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/Android.mk b/Android.mk
index 45b3f62..936374f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,7 +67,6 @@ common_static_libraries := \
 	libfec_rs \
 	libsquashfs_utils \
 	libscrypt_static \
-	libbatteryservice \
 	libavb \
 
 vold_conlyflags := -std=c11
diff --git a/CheckBattery.cpp b/CheckBattery.cpp
index 6390d02..27b3b0b 100644
--- a/CheckBattery.cpp
+++ b/CheckBattery.cpp
@@ -17,11 +17,6 @@
 #define LOG_TAG "VoldCheckBattery"
 #include <cutils/log.h>
 
-#include <binder/IServiceManager.h>
-#include <batteryservice/IBatteryPropertiesRegistrar.h>
-
-using namespace android;
-
 extern "C"
 {
     int is_battery_ok_to_start()