From 4a3c3fb15f198e735565a98a492cd1104385273b Mon Sep 17 00:00:00 2001
From: Tommy Chiu <tommychiu@google.com>
Date: Wed, 12 Oct 2022 12:21:52 +0000
Subject: [PATCH 1/2] aosp_common: Remove device_id_attestation from aosp build

Bug: 246959736
Change-Id: Ic3a949afbb29289a4f52a013de7e65e3b28026cd
---
 aosp_common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aosp_common.mk b/aosp_common.mk
index 5ba98821..d4d8d94a 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -53,3 +53,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
 
 # TODO: fix
 # PRODUCT_RESTRICT_VENDOR_FILES := all
+
+# Exclude features that are not available on AOSP devices.
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
\ No newline at end of file

From ab9dcfae233496d9f585082d5c6c3ece1a5db2bb Mon Sep 17 00:00:00 2001
From: Anthony Stange <stange@google.com>
Date: Tue, 18 Oct 2022 13:38:50 +0000
Subject: [PATCH 2/2] Add OnChipAccMask to gps.xml

Bug: 249751526
Test: b/249751526#comment3
Change-Id: I31940bc9f45b657e5642d2b9d031a7bb101cbe9d
---
 gnss/47765/config/gps.xml             | 1 +
 gnss/47765/config/gps.xml.oriole      | 1 +
 gnss/47765/config/gps.xml.raven       | 1 +
 gnss/47765/config/gps_user.xml        | 1 +
 gnss/47765/config/gps_user.xml.oriole | 1 +
 gnss/47765/config/gps_user.xml.raven  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml
index 40dcd36f..8fb7c66e 100644
--- a/gnss/47765/config/gps.xml
+++ b/gnss/47765/config/gps.xml
@@ -87,6 +87,7 @@
        EnableOnChipStopNotification="2"
        PowerMode="3"
        MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps.xml.oriole b/gnss/47765/config/gps.xml.oriole
index 2e59b783..d85fd169 100644
--- a/gnss/47765/config/gps.xml.oriole
+++ b/gnss/47765/config/gps.xml.oriole
@@ -87,6 +87,7 @@
        EnableOnChipStopNotification="2"
        PowerMode="3"
        MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps.xml.raven b/gnss/47765/config/gps.xml.raven
index c4a25b4a..a095dbd1 100644
--- a/gnss/47765/config/gps.xml.raven
+++ b/gnss/47765/config/gps.xml.raven
@@ -87,6 +87,7 @@
        EnableOnChipStopNotification="2"
        PowerMode="3"
        MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps_user.xml b/gnss/47765/config/gps_user.xml
index 16c12303..5efd5421 100644
--- a/gnss/47765/config/gps_user.xml
+++ b/gnss/47765/config/gps_user.xml
@@ -86,6 +86,7 @@
        EnableOnChipStopNotification="false"
        PowerMode="3"
        MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps_user.xml.oriole b/gnss/47765/config/gps_user.xml.oriole
index 47ba3d1e..2d503725 100644
--- a/gnss/47765/config/gps_user.xml.oriole
+++ b/gnss/47765/config/gps_user.xml.oriole
@@ -86,6 +86,7 @@
        EnableOnChipStopNotification="false"
        PowerMode="3"
        MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps_user.xml.raven b/gnss/47765/config/gps_user.xml.raven
index 3a0cb55e..b2fb2bd2 100644
--- a/gnss/47765/config/gps_user.xml.raven
+++ b/gnss/47765/config/gps_user.xml.raven
@@ -86,6 +86,7 @@
        EnableOnChipStopNotification="false"
        PowerMode="3"
        MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
   />
 
   <gll_features