tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Be more aggressive about obtaining vold service."

Browse source 
This reverts commit 4a53a9edb3.

Change-Id: Ie4058488226bf53b78063dd3feb011dbd0167d1e
This commit is contained in:
Jeff Sharkey 2017-09-25 23:21:24 +00:00
parent 4a53a9edb3
commit 5687066dcc
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vdc.cpp
View file

@ -39,21 +39,6 @@
static void usage(char *progname);
static android::sp<android::IBinder> getServiceAggressive() {
android::sp<android::IBinder> res;
auto sm = android::defaultServiceManager();
auto name = android::String16("vold");
for (int i = 0; i < 500; i++) {
res = sm->checkService(name);
if (res) {
LOG(VERBOSE) << "Waited " << (i * 10) << "ms for vold";
break;
}
usleep(10000); // 10ms
}
return res;
}
int main(int argc, char **argv) {
int sock;
int wait;
@ -61,7 +46,6 @@ int main(int argc, char **argv) {
progname = argv[0];
setenv("ANDROID_LOG_TAGS", "*:v", 1);
if (getppid() == 1) {
// If init is calling us then it's during boot and we should log to kmsg
android::base::InitLogging(argv, &android::base::KernelLogger);
@ -83,7 +67,8 @@ int main(int argc, char **argv) {
std::string arg1 = argv[1];
std::string arg2 = argv[2];
android::sp<android::IBinder> binder = getServiceAggressive();
android::sp<android::IBinder> binder = android::defaultServiceManager()->getService(
android::String16("vold"));
if (!binder) {
LOG(ERROR) << "Failed to obtain vold Binder";
exit(EINVAL);