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

Merge "Remove CheckBattery altogether"

Browse source
This commit is contained in:
Treehugger Robot 2017-10-03 23:19:02 +00:00 committed by Gerrit Code Review
commit 2890b8d215
4 changed files with 0 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Android.mk
View file

@ -14,7 +14,6 @@ common_src_files := \
Loop.cpp \ Loop.cpp \
Devmapper.cpp \ Devmapper.cpp \
ResponseCode.cpp \ ResponseCode.cpp \
CheckBattery.cpp \
Ext4Crypt.cpp \ Ext4Crypt.cpp \
VoldUtil.c \ VoldUtil.c \
cryptfs.cpp \ cryptfs.cpp \

33
CheckBattery.cpp
View file

@ -1,33 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define LOG_TAG "VoldCheckBattery"
#include <cutils/log.h>
extern "C"
{
int is_battery_ok_to_start()
{
// Bug 16868177 exists to purge this code completely
return true; //is_battery_ok(START_THRESHOLD);
}
int is_battery_ok_to_continue()
{
// Bug 16868177 exists to purge this code completely
return true; //is_battery_ok(CONTINUE_THRESHOLD);
}
}

31
CheckBattery.h
View file

@ -1,31 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef _CHECKBATTERY_H__
#define _CHECKBATTERY_H__
#ifdef __cplusplus
extern "C" {
#endif
int is_battery_ok_to_start();
int is_battery_ok_to_continue();
#ifdef __cplusplus
}
#endif
#endif

20
cryptfs.cpp
View file

@ -58,7 +58,6 @@
#include "VoldUtil.h" #include "VoldUtil.h"
#include "Ext4Crypt.h" #include "Ext4Crypt.h"
#include "f2fs_sparseblock.h" #include "f2fs_sparseblock.h"
#include "CheckBattery.h"
#include "Process.h" #include "Process.h"
#include "Keymaster.h" #include "Keymaster.h"
#include "android-base/properties.h" #include "android-base/properties.h"
@ -2172,13 +2171,6 @@ static int encrypt_groups(struct encryptGroupsData* data)
goto errout; goto errout;
} }
} }
if (!is_battery_ok_to_continue()) {
SLOGE("Stopping encryption due to low battery");
rc = 0;
goto errout;
}
} }
if (flush_outstanding_data(data)) { if (flush_outstanding_data(data)) {
goto errout; goto errout;
@ -2501,13 +2493,6 @@ static int cryptfs_enable_inplace_full(char *crypto_blkdev, char *real_blkdev,
CRYPT_SECTORS_PER_BUFSIZE, CRYPT_SECTORS_PER_BUFSIZE,
i * CRYPT_SECTORS_PER_BUFSIZE); i * CRYPT_SECTORS_PER_BUFSIZE);
} }
if (!is_battery_ok_to_continue()) {
SLOGE("Stopping encryption due to low battery");
*size_already_done += (i + 1) * CRYPT_SECTORS_PER_BUFSIZE - 1;
rc = 0;
goto errout;
}
} }
/* Do any remaining sectors */ /* Do any remaining sectors */
@ -2631,11 +2616,6 @@ static int cryptfs_enable_all_volumes(struct crypt_mnt_ftr *crypt_ftr, int how,
off64_t cur_encryption_done=0, tot_encryption_size=0; off64_t cur_encryption_done=0, tot_encryption_size=0;
int rc = -1; int rc = -1;
if (!is_battery_ok_to_start()) {
SLOGW("Not starting encryption due to low battery");
return 0;
}
/* The size of the userdata partition, and add in the vold volumes below */ /* The size of the userdata partition, and add in the vold volumes below */
tot_encryption_size = crypt_ftr->fs_size; tot_encryption_size = crypt_ftr->fs_size;