| commit | 2b553132747fb1d6758c20cf622cbea30444d3da | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Sat Mar 02 02:02:42 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Sat Mar 02 02:02:42 2024 +0000 |
| tree | e803badf1d221f70968b55cf3eefab7b5a42cf4a | |
| parent | 6e0e7e0d8376d6353207406978771d09f3948421 [diff] | |
| parent | 73926417db8eb5e08974c7b246381d57692abf2f [diff] |
Snap for 11520864 from 73926417db8eb5e08974c7b246381d57692abf2f to 24Q2-release Change-Id: I3b2607f07cd7c193d4b9031b574a98cf690e0afd
diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml index d1f5832..1b70812 100644 --- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml +++ b/oriole/rro_overlays/NfcOverlay/res/values/config.xml
@@ -32,4 +32,5 @@ <integer-array name="antenna_y"> <item>106</item> </integer-array> + <bool name="nfc_observe_mode_supported">true</bool> </resources>
diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml index e17a0a2..9545f18 100644 --- a/raven/rro_overlays/NfcOverlay/res/values/config.xml +++ b/raven/rro_overlays/NfcOverlay/res/values/config.xml
@@ -32,4 +32,5 @@ <integer-array name="antenna_y"> <item>106</item> </integer-array> + <bool name="nfc_observe_mode_supported">true</bool> </resources>
diff --git a/self-extractors_oriole/google_devices/staging/Android.mk.template b/self-extractors_oriole/google_devices/staging/Android.mk.template index 835f6e8..106d70a 100644 --- a/self-extractors_oriole/google_devices/staging/Android.mk.template +++ b/self-extractors_oriole/google_devices/staging/Android.mk.template
@@ -72,9 +72,9 @@ LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := PRESIGNED +LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE include $(BUILD_PREBUILT)