Unify the recovery UI for pixel 3+

The Pixel 3 and 4 are using the identical RecoveryUI class. So
consolidate them into the pixel common directory. This will ease the
work to unify the vendor space /misc access later.

Bug: 144810561
Test: wipe data in bramble and redfin
Change-Id: I43b7d04fe65ce919eb5c81a39034f50ce2ca9626
Signed-off-by: Chenglu Lin <chenglulin@google.com>
This commit is contained in:
Tianjie Xu
2019-11-06 15:15:32 -08:00
committed by Chenglu Lin
parent b71190a3e3
commit c260ea6cae
3 changed files with 0 additions and 136 deletions

View File

@@ -1,39 +0,0 @@
//
// Copyright (C) 2018 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.
//
cc_library_static {
name: "librecovery_ui_redfin",
owner: "google",
cflags: [
"-Wall",
"-Wextra",
"-Werror",
"-pedantic",
],
srcs: [
"recovery_ui.cpp",
],
static_libs: [
"libbase",
"libnos_for_recovery",
"libnos_citadel_for_recovery",
],
shared_libs: [
"librecovery_ui",
],
}

View File

@@ -1,92 +0,0 @@
/*
* Copyright (C) 2018 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.
*/
#include <android-base/endian.h>
#include <android-base/logging.h>
#include <app_nugget.h>
#include <nos/debug.h>
#include <nos/NuggetClient.h>
#include <recovery_ui/device.h>
#include <recovery_ui/screen_ui.h>
namespace android {
namespace device {
namespace google {
namespace redfin {
namespace {
/** Wipe user data from Titan M. */
bool WipeTitanM() {
// Connect to Titan M
::nos::NuggetClient client;
client.Open();
if (!client.IsOpen()) {
LOG(ERROR) << "Failed to connect to Titan M";
return false;
}
// Tell it to wipe user data
const uint32_t magicValue = htole32(ERASE_CONFIRMATION);
std::vector<uint8_t> magic(sizeof(magicValue));
memcpy(magic.data(), &magicValue, sizeof(magicValue));
const uint32_t status
= client.CallApp(APP_ID_NUGGET, NUGGET_PARAM_NUKE_FROM_ORBIT, magic, nullptr);
if (status != APP_SUCCESS) {
LOG(ERROR) << "Titan M user data wipe failed: " << ::nos::StatusCodeString(status)
<< " (" << status << ")";
return false;
}
LOG(INFO) << "Titan M wipe successful";
return true;
}
} // namespace
class RedfinDevice : public ::Device
{
public:
RedfinDevice(::ScreenRecoveryUI* const ui) : ::Device(ui) {}
/** Hook to wipe user data not stored in /data */
bool PostWipeData() override {
// Try to do everything but report a failure if anything wasn't successful
bool totalSuccess = true;
::RecoveryUI* const ui = GetUI();
ui->Print("Wiping Titan M...\n");
if (!WipeTitanM()) {
totalSuccess = false;
}
// Extendable to wipe other components
return totalSuccess;
}
};
} // namespace redfin
} // namespace google
} // namespace device
} // namespace android
Device *make_device()
{
return new ::android::device::google::redfin::RedfinDevice(new ::ScreenRecoveryUI);
}

View File

@@ -31,11 +31,6 @@ TARGET_BOARD_COMMON_PATH := device/google/redfin/sm7250
# DTBO partition definitions
BOARD_PREBUILT_DTBOIMAGE := device/google/redfin-kernel/dtbo.img
TARGET_RECOVERY_UI_LIB := \
librecovery_ui_redfin \
libnos_citadel_for_recovery \
libnos_for_recovery
TARGET_FS_CONFIG_GEN := device/google/redfin/config.fs
# Kernel modules