summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2020-10-05 20:21:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-05 20:21:46 +0000
commitafe23555ad56cfd267b11f3d3b79a475d0f98f1a (patch)
tree732b3fc6fff2f86159da60d741f4e48eb4d1f6f7
parente072e96c13e5b07e21bbf760ec996ed0b476ecee (diff)
parent365efe26a8f0aca15f0df6661084e12f402d104b (diff)
db845c: Add missing etc/permissions/android.software.xml am: 365efe26a8
Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1434892 Change-Id: I572a598f77ecdefc7f6c65dad2fc069622ee651e
-rw-r--r--device-common.mk4
-rw-r--r--etc/permissions/android.software.xml43
2 files changed, 47 insertions, 0 deletions
diff --git a/device-common.mk b/device-common.mk
index d0f540e..f39d550 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -138,6 +138,10 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/seccomp_policy/mediaswcodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaswcodec.policy
+# Copy hardware config file(s)
+PRODUCT_COPY_FILES += \
+ device/linaro/dragonboard/etc/permissions/android.software.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.xml
+
# Memtrack
PRODUCT_PACKAGES += \
memtrack.default \
diff --git a/etc/permissions/android.software.xml b/etc/permissions/android.software.xml
new file mode 100644
index 0000000..742a086
--- /dev/null
+++ b/etc/permissions/android.software.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- These are the hardware components that all handheld devices
+ must include. Devices with optional hardware must also include extra
+ hardware files, per the comments below.
+
+ Handheld devices include phones, mobile Internet devices (MIDs),
+ Personal Media Players (PMPs), small tablets (7" or less), and similar
+ devices.
+-->
+<permissions>
+ <!-- following features are said to be "basic system services"
+ in frameworks/native/data/etc/tablet_core_hardware.xml,
+ -->
+ <feature name="android.software.activities_on_secondary_displays" />
+ <feature name="android.software.autofill" />
+ <feature name="android.software.companion_device_setup" />
+ <feature name="android.software.home_screen" />
+ <feature name="android.software.input_methods" />
+ <feature name="android.software.picture_in_picture" />
+ <feature name="android.software.print" />
+
+ <!-- need by following cts test
+ android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndBackground
+ android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch
+ -->
+ <feature name="android.software.cant_save_state" />
+
+</permissions>