summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Chang <georgekgchang@google.com>2019-08-21 15:52:10 +0800
committerGeorge Chang <georgekgchang@google.com>2019-08-21 13:08:20 +0000
commit521b7e2a0fc42c7adbff86d10fe65c2e935d6643 (patch)
tree6af307adb42ac0ebe8033b00bd6264f99fe858d0
parent926292bc116c38eba1f962fe4b4f1456309d3ebf (diff)
downloadbonito-521b7e2a0fc42c7adbff86d10fe65c2e935d6643.tar.gz
Add feature flag for Japan SKU
Allow apps to optimize behavior for Japan SKU Bug: 139079084 Test: Check feature from PackageManager Change-Id: I35c6b61fc1b4dd819bedafd5b18d0a60508da763
-rw-r--r--device.mk6
-rw-r--r--nfc/com.google.hardware.pixel.japan.xml21
2 files changed, 26 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index c6b7d938..33b6037e 100644
--- a/device.mk
+++ b/device.mk
@@ -428,7 +428,11 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020E/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020F/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020G/android.hardware.nfc.uicc.xml \
- frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020H/android.hardware.nfc.ese.xml \
+ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020H/android.hardware.nfc.ese.xml
+
+PRODUCT_COPY_FILES += \
+ device/google/bonito/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020D/com.google.hardware.pixel.japan.xml \
+ device/google/bonito/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020H/com.google.hardware.pixel.japan.xml
PRODUCT_PACKAGES += \
android.hardware.usb@1.1-service.bonito
diff --git a/nfc/com.google.hardware.pixel.japan.xml b/nfc/com.google.hardware.pixel.japan.xml
new file mode 100644
index 00000000..bf06ed24
--- /dev/null
+++ b/nfc/com.google.hardware.pixel.japan.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<!--
+ Feature for Pixel Japan SKU devices.
+-->
+<permissions>
+ <feature name="com.google.hardware.pixel.japan" />
+</permissions>