From 0bc47d654b05e8208ba7ef8cf8db463ac28fe879 Mon Sep 17 00:00:00 2001
From: Victor Liu <victorliu@google.com>
Date: Tue, 20 Apr 2021 22:15:02 +0000
Subject: [PATCH 1/2] Revert "device: don't build uwb"

This reverts commit 7357dbcb595d688aede6affc72715366cb4f206e.

Reason for revert: Fixed uwb service crash
Test: flash on raven, verify uwb service is idle, unplug usb
Change-Id: I2f3a3a73d16e8a282fdbb171bf60ad2cafa0d7c5
---
 device-raven.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device-raven.mk b/device-raven.mk
index 6d9f26d..8ef95c3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -27,6 +27,9 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
 
 include device/google/gs101/device-shipping-common.mk
 include device/google/gs101/fingerprint/udfps.mk
+ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
+include device/google/gs101/uwb/uwb.mk
+endif
 include device/google/raviole/audio/raven/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.mk
 

From 65afc07bcb0590380cf356d63e916a391e6c035e Mon Sep 17 00:00:00 2001
From: Benjamin Schwartz <bsschwar@google.com>
Date: Wed, 21 Apr 2021 11:34:17 -0700
Subject: [PATCH 2/2] powerstats: Add NFC stats

Bug: 184722506
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I3b8dce2f7170c686a619dfda1002a49edf3a5428
---
 powerstats/oriole/service.cpp | 1 +
 powerstats/raven/service.cpp  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/powerstats/oriole/service.cpp b/powerstats/oriole/service.cpp
index 6da7102..f6479f3 100644
--- a/powerstats/oriole/service.cpp
+++ b/powerstats/oriole/service.cpp
@@ -68,6 +68,7 @@ int main() {
 
     addGs101CommonDataProviders(p);
     addDisplay(p);
+    addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/3-0008/power_stats");
 
     const std::string instance = std::string() + PowerStats::descriptor + "/default";
     binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
diff --git a/powerstats/raven/service.cpp b/powerstats/raven/service.cpp
index f1322a9..4224c1f 100644
--- a/powerstats/raven/service.cpp
+++ b/powerstats/raven/service.cpp
@@ -110,6 +110,7 @@ int main() {
 
     addGs101CommonDataProviders(p);
     addDisplay(p);
+    addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/4-0008/power_stats");
     addUwb(p);
 
     const std::string instance = std::string() + PowerStats::descriptor + "/default";