Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "felix(nfc): Modify NFC overlays for NFC apex"

Browse source 
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://android-review.googlesource.com/q/commit:9b9ed35e2791458c36b792ee049972c978b75606)
Merged-In: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
This commit is contained in:
Roshan Pius 2023-11-04 19:04:38 +00:00 • committed by Cherrypicker Worker
parent 77c7941c6d
commit e274b4177a
5 changed files with 1 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rro_overlays/NfcOverlay/Android.bp
View file

@ -1,9 +0,0 @@
package {
default_applicable_licenses: ["device_google_felix_license"],
}
runtime_resource_overlay {
name: "NfcOverlayFelix",
sdk_version: "current",
product_specific: true
}

27
rro_overlays/NfcOverlay/AndroidManifest.xml
View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2023 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.
-->
<!-- Pixel specific nfc overlays -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.nfc.overlay"
android:versionCode="1"
android:versionName="1.0">
<application android:hasCode="false" />
<overlay
android:targetPackage="com.android.nfc"
android:targetName="NfcCustomization"
android:isStatic="true"
android:priority="0"/>
</manifest>

2
rro_overlays/NfcOverlay/OWNERS
View file

@ -1,2 +0,0 @@
# Bug component: 48448
include platform/packages/apps/Nfc:/OWNERS

35
rro_overlays/NfcOverlay/res/values/config.xml
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 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.
-->
<resources>
<bool name="nfcc_always_on_allowed">true</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>G9FPL</item>
<item>G0B96</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">160</integer>
<integer name="device_height">140</integer>
<bool name="device_foldable">true</bool>
<integer-array name="antenna_x">
<item>90</item>
<item>30</item>
</integer-array>
<integer-array name="antenna_y">
<item>103</item>
<item>103</item>
</integer-array>
</resources>