diff options
| author | John Stultz <john.stultz@linaro.org> | 2020-09-23 02:09:15 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2020-09-23 02:11:55 +0000 |
| commit | 365efe26a8f0aca15f0df6661084e12f402d104b (patch) | |
| tree | 732b3fc6fff2f86159da60d741f4e48eb4d1f6f7 | |
| parent | 48ce23715a5f3cf094e014922d9110462791458c (diff) | |
db845c: Add missing etc/permissions/android.software.xml
Since Android11 merged in, I have been seeing some odd crashes
occasionally that was pointing to the fact that the
AutoFillManager mService value was null.
However, this same issue was not seen on HiKey960, with the same
application and AOSP source.
I dug around and realized we were not adding the
android.software.xml file we add on HiKey960, and copying it over
resolves the issue.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I1bc88c67030b0ed69511acdf348c27367bf7213a
| -rw-r--r-- | device-common.mk | 4 | ||||
| -rw-r--r-- | etc/permissions/android.software.xml | 43 |
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> |