Snap for 6001391 from 78817f21ba98c842b68078ba2b04f9c1f91d170e to qt-aml-resolv-releaseandroid-mainline-10.0.0_r8android10-mainline-resolv-release

Change-Id: Ibb27cabbe7f719470e74b0f7570d40c4e208742b

19 files changed, 61 insertions, 166 deletions

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 5773daf6..3287aa8e 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -89,7 +89,7 @@ TARGET_RECOVERY_WIPE := device/google/bonito/recovery.wipe
 TARGET_RECOVERY_FSTAB := device/google/bonito/fstab.hardware
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
 TARGET_RECOVERY_UI_LIB := \
-    librecovery_ui_bonito \
+    librecovery_ui_pixel \
     libnos_citadel_for_recovery \
     libnos_for_recovery \
     libbootloader_message \
diff --git a/aosp_bonito.mk b/aosp_bonito.mk
index f8ec5739..b476258c 100644
--- a/aosp_bonito.mk
+++ b/aosp_bonito.mk
@@ -24,9 +24,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 # TODO(b/138706293): Enable mainline checking later
 # PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
-    root/init.zygote64_32.rc \
-
 #
 # All components inherited here go to product image
 #
diff --git a/aosp_sargo.mk b/aosp_sargo.mk
index ad031a99..9322461b 100644
--- a/aosp_sargo.mk
+++ b/aosp_sargo.mk
@@ -24,9 +24,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 # TODO(b/138706293): Enable mainline checking later
 # PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
-    root/init.zygote64_32.rc \
-
 #
 # All components inherited here go to product image
 #
diff --git a/audio/rt5514_dsp_fw1.bin b/audio/rt5514_dsp_fw1.bin
index 57d55ac3..40cfb490 100644
--- a/audio/rt5514_dsp_fw1.bin
+++ b/audio/rt5514_dsp_fw1.bin
diff --git a/audio/rt5514_dsp_fw2.bin b/audio/rt5514_dsp_fw2.bin
index ea58cac0..f194cb0f 100644
--- a/audio/rt5514_dsp_fw2.bin
+++ b/audio/rt5514_dsp_fw2.bin
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index b4b3661f..6a6ade15 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -281,6 +281,15 @@ static void DumpF2FS(int fd) {
     DumpFileToFd(fd, "F2FS - fragmentation", "/proc/fs/f2fs/dm-6/segment_info");
 }
 
+static void DumpPower(int fd) {
+    RunCommandToFd(fd, "Power Stats Times", {"/vendor/bin/sh", "-c",
+                   "echo -n \"Boot: \" && /vendor/bin/uptime -s &&"
+                   "echo -n \"Now: \" && date"});
+    DumpFileToFd(fd, "Sleep Stats", "/sys/power/system_sleep/stats");
+    DumpFileToFd(fd, "Power Management Stats", "/sys/power/rpmh_stats/master_stats");
+    DumpFileToFd(fd, "WLAN Power Stats", "/d/wlan0/power_stats");
+}
+
 static void DumpeMMC(int fd) {
     DumpFileToFd(fd, "eMMC model", "/sys/block/mmcblk0/device/name");
     DumpFileToFd(fd, "eMMC prv", "/sys/block/mmcblk0/device/prv");
@@ -333,9 +342,9 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
     DumpeMMC(fd);
 
     DumpFileToFd(fd, "INTERRUPTS", "/proc/interrupts");
-    DumpFileToFd(fd, "Sleep Stats", "/sys/power/system_sleep/stats");
-    DumpFileToFd(fd, "Power Management Stats", "/sys/power/rpmh_stats/master_stats");
-    DumpFileToFd(fd, "WLAN Power Stats", "/d/wlan0/power_stats");
+
+    DumpPower(fd);
+
     DumpFileToFd(fd, "LL-Stats", "/d/wlan0/ll_stats");
     DumpFileToFd(fd, "ICNSS Stats", "/d/icnss/stats");
     DumpFileToFd(fd, "SMD Log", "/d/ipc_logging/smd/log");
diff --git a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png
index d397d5d2..0d5a1b56 100644
--- a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png
+++ b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020a.png
diff --git a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png
index 59c73b54..7b4847a1 100644
--- a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png
+++ b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png
diff --git a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png
index dc6d0dcd..e9ecf8ef 100644
--- a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png
+++ b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020d.png
diff --git a/recovery/Android.bp b/recovery/Android.bp
deleted file mode 100644
index f87dc95c..00000000
--- a/recovery/Android.bp
+++ /dev/null
@@ -1,40 +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_bonito",
-    owner: "google",
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-        "-pedantic",
-    ],
-    srcs: [
-        "recovery_ui.cpp",
-    ],
-
-    static_libs: [
-        "libbase",
-        "libbootloader_message",
-        "libnos_for_recovery",
-        "libnos_citadel_for_recovery",
-    ],
-
-    shared_libs: [
-        "librecovery_ui",
-    ],
-}
diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
deleted file mode 100644
index e3f16f20..00000000
--- a/recovery/recovery_ui.cpp
+++ /dev/null
@@ -1,116 +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 <stdint.h>
-#include <string.h>
-
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include <android-base/endian.h>
-#include <android-base/logging.h>
-#include <app_nugget.h>
-#include <bootloader_message/bootloader_message.h>
-#include <nos/NuggetClient.h>
-#include <nos/debug.h>
-#include <recovery_ui/device.h>
-#include <recovery_ui/screen_ui.h>
-
-namespace android {
-namespace device {
-namespace google {
-namespace bonito {
-
-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;
-}
-
-// Wipes the provisioned flag as part of data wipe.
-bool WipeProvisionedFlag() {
-    // Must be consistent with the one in init.hardware.rc (10-byte `theme-dark`).
-    const std::string wipe_str(10, '\x00');
-    constexpr size_t kProvisionedFlagOffsetInVendorSpace = 0;
-    if (std::string err; !WriteMiscPartitionVendorSpace(
-            wipe_str.data(), wipe_str.size(), kProvisionedFlagOffsetInVendorSpace, &err)) {
-        LOG(ERROR) << "Failed to write wipe string: " << err;
-        return false;
-    }
-    LOG(INFO) << "Provisioned flag wiped successful";
-    return true;
-}
-
-} // namespace
-
-class BonitoDevice : public ::Device
-{
-public:
-    BonitoDevice(::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;
-        }
-
-        if (!WipeProvisionedFlag()) {
-            totalSuccess = false;
-        }
-
-        // Extendable to wipe other components
-
-        return totalSuccess;
-    }
-};
-
-} // namespace bonito
-} // namespace google
-} // namespace device
-} // namespace android
-
-Device *make_device()
-{
-    return new ::android::device::google::bonito::BonitoDevice(new ::ScreenRecoveryUI);
-}
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png
index c66be537..2868014b 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e.png
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png
index b72a5580..cb342e03 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020e_vn.png
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png
index 35c78dd0..4155dda2 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png
diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png
index 35c7c4a1..6c837efb 100644
--- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png
+++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020h.png
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index bcfcc612..51e24de5 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -1,6 +1,8 @@
   google_devices)
     TO_EXTRACT="\
             IMAGES/vendor.img \
+            RADIO/bootloader.img \
+            RADIO/radio.img \
             "
     ;;
   qcom)
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
new file mode 100644
index 00000000..339e8009
--- /dev/null
+++ b/self-extractors/google_devices/staging/Android.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2019 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter bonito,$(TARGET_DEVICE)),)
+  $(call add-radio-file,bootloader.img)
+  $(call add-radio-file,radio.img)
+endif
diff --git a/self-extractors_sargo/extract-lists.txt b/self-extractors_sargo/extract-lists.txt
index bcfcc612..51e24de5 100644
--- a/self-extractors_sargo/extract-lists.txt
+++ b/self-extractors_sargo/extract-lists.txt
@@ -1,6 +1,8 @@
   google_devices)
     TO_EXTRACT="\
             IMAGES/vendor.img \
+            RADIO/bootloader.img \
+            RADIO/radio.img \
             "
     ;;
   qcom)
diff --git a/self-extractors_sargo/google_devices/staging/Android.mk b/self-extractors_sargo/google_devices/staging/Android.mk
new file mode 100644
index 00000000..eeae0715
--- /dev/null
+++ b/self-extractors_sargo/google_devices/staging/Android.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2019 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter sargo,$(TARGET_DEVICE)),)
+  $(call add-radio-file,bootloader.img)
+  $(call add-radio-file,radio.img)
+endif