Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main
This commit is contained in:
commit
c2a6f0f1db
10 changed files with 0 additions and 82 deletions
|
@ -423,6 +423,3 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
|
||||||
# Enable DeviceAsWebcam support
|
# Enable DeviceAsWebcam support
|
||||||
PRODUCT_VENDOR_PROPERTIES += \
|
PRODUCT_VENDOR_PROPERTIES += \
|
||||||
ro.usb.uvc.enabled=true
|
ro.usb.uvc.enabled=true
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
|
||||||
NfcOverlayHusky \
|
|
||||||
|
|
|
@ -391,6 +391,3 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
|
||||||
# Enable DeviceAsWebcam support
|
# Enable DeviceAsWebcam support
|
||||||
PRODUCT_VENDOR_PROPERTIES += \
|
PRODUCT_VENDOR_PROPERTIES += \
|
||||||
ro.usb.uvc.enabled=true
|
ro.usb.uvc.enabled=true
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
|
||||||
NfcOverlayShiba
|
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
package {
|
|
||||||
default_applicable_licenses: ["device_google_shusky_license"],
|
|
||||||
}
|
|
||||||
|
|
||||||
runtime_resource_overlay {
|
|
||||||
name: "NfcOverlayHusky",
|
|
||||||
sdk_version: "current",
|
|
||||||
product_specific: true
|
|
||||||
}
|
|
|
@ -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>
|
|
|
@ -1,2 +0,0 @@
|
||||||
# Bug component: 48448
|
|
||||||
include platform/packages/apps/Nfc:/OWNERS
|
|
|
@ -1,9 +0,0 @@
|
||||||
package {
|
|
||||||
default_applicable_licenses: ["device_google_shusky_license"],
|
|
||||||
}
|
|
||||||
|
|
||||||
runtime_resource_overlay {
|
|
||||||
name: "NfcOverlayShiba",
|
|
||||||
sdk_version: "current",
|
|
||||||
product_specific: true
|
|
||||||
}
|
|
|
@ -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>
|
|
|
@ -1,2 +0,0 @@
|
||||||
# Bug component: 48448
|
|
||||||
include platform/packages/apps/Nfc:/OWNERS
|
|
Loading…
Add table
Add a link
Reference in a new issue