summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BoardConfig.mk3
-rw-r--r--camera/QCamera2/HAL3/QCamera3HWI.cpp6
-rw-r--r--compatibility_matrix.xml59
-rw-r--r--device.mk13
-rw-r--r--dumpstate/DumpstateDevice.cpp2
-rwxr-xr-xinit.angler.rc1
-rw-r--r--init.angler.usb.rc4
-rwxr-xr-xoverlay/frameworks/base/core/res/res/values/config.xml3
-rw-r--r--sensorhal/sensorlist.cpp11
-rw-r--r--sepolicy/rild.te4
10 files changed, 80 insertions, 26 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 339d6f4..a8ef362 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -142,4 +142,7 @@ USE_CLANG_PLATFORM_BUILD := true
TARGET_FS_CONFIG_GEN += device/huawei/angler/config.fs
+DEVICE_MANIFEST_FILE := device/huawei/angler/manifest.xml
+DEVICE_MATRIX_FILE := device/huawei/angler/compatibility_matrix.xml
+
-include vendor/huawei/angler/BoardConfigVendor.mk
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index f94d211..1893800 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -804,7 +804,7 @@ int QCamera3HardwareInterface::validateStreamDimensions(
for (size_t i = 0; i< streamList->num_streams; i++) {
if (streamList->streams[i]->stream_type == CAMERA3_STREAM_INPUT) {
if (inputStream != NULL) {
- ALOGE("%s: Error, Multiple input streams requested");
+ ALOGE("%s: Error, Multiple input streams requested", __func__);
return -EINVAL;
}
inputStream = streamList->streams[i];
@@ -2075,7 +2075,7 @@ int QCamera3HardwareInterface::validateCaptureRequest(
return BAD_VALUE;
}
if (request->num_output_buffers >= MAX_NUM_STREAMS) {
- ALOGE("%s: Number of buffers %d equals or is greater than maximum number of streams!",
+ ALOGE("%s: Number of buffers %d equals or is greater than maximum number of streams %d!",
__func__, request->num_output_buffers, MAX_NUM_STREAMS);
return BAD_VALUE;
}
@@ -4265,7 +4265,7 @@ template <typename fwkType, class mapType> int lookupHalName(const mapType *arr,
}
}
- ALOGE("%s: Cannot find matching hal type fwk_name=%d", __func__, fwk_name);
+ ALOGE("%s: Cannot find matching hal type fwk_name=%d", __func__, (int)fwk_name);
return NAME_NOT_FOUND;
}
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..3082485
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,59 @@
+<compatibility-matrix version="1.0" type="device">
+ <hal format="hidl" optional="false">
+ <name>android.frameworks.schedulerservice</name>
+ <version>1.0</version>
+ <interface>
+ <name>ISchedulingPolicyService</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.frameworks.sensorservice</name>
+ <version>1.0</version>
+ <interface>
+ <name>ISensorManager</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.allocator</name>
+ <version>1.0</version>
+ <interface>
+ <name>IAllocator</name>
+ <instance>ashmem</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.manager</name>
+ <version>1.0</version>
+ <interface>
+ <name>IServiceManager</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.memory</name>
+ <version>1.0</version>
+ <interface>
+ <name>IMapper</name>
+ <instance>ashmem</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.hidl.token</name>
+ <version>1.0</version>
+ <interface>
+ <name>ITokenManager</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="false">
+ <name>android.system.wifi.keystore</name>
+ <version>1.0</version>
+ <interface>
+ <name>IKeystore</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+
+</compatibility-matrix>
diff --git a/device.mk b/device.mk
index a88576b..fa6a9ff 100644
--- a/device.mk
+++ b/device.mk
@@ -61,10 +61,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/huawei/angler/thermal-engine-angler.conf:system/etc/thermal-engine.conf
-# Vendor Interface Manifest
-PRODUCT_COPY_FILES += \
- device/huawei/angler/manifest.xml:vendor/manifest.xml
-
# Media
PRODUCT_COPY_FILES += \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
@@ -138,6 +134,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
+ frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:system/etc/permissions/android.hardware.wifi.passpoint.xml \
frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
@@ -349,14 +346,6 @@ PRODUCT_PACKAGES += \
android.hardware.usb@1.0-service
# Library used for VTS tests (only for userdebug and eng builds)
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# Test HAL for hwbinder performance benchmark.
-PRODUCT_PACKAGES += \
- android.hardware.tests.libhwbinder@1.0-impl
-
-# Test HAL for FMQ performance benchmark.
-PRODUCT_PACKAGES += \
- android.hardware.tests.msgq@1.0-impl
-
# For VTS profiling.
PRODUCT_PACKAGES += \
libvts_profiling \
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 62e14be..898861e 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -34,7 +34,7 @@ namespace implementation {
// Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.
Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
- if (handle->numFds < 1) {
+ if (handle == nullptr || handle->numFds < 1) {
ALOGE("no FDs\n");
return Void();
}
diff --git a/init.angler.rc b/init.angler.rc
index 04859e6..0b90fab 100755
--- a/init.angler.rc
+++ b/init.angler.rc
@@ -339,6 +339,7 @@ service rmt_storage /vendor/bin/rmt_storage
user root
group system wakelock
writepid /dev/cpuset/system-background/tasks
+ shutdown critical
service qseecomd /vendor/bin/qseecomd
class core
diff --git a/init.angler.usb.rc b/init.angler.usb.rc
index d186220..5e63724 100644
--- a/init.angler.usb.rc
+++ b/init.angler.usb.rc
@@ -28,9 +28,9 @@ on boot
on post-fs
mkdir /dev/usb-ffs 0775 shell shell
mkdir /dev/usb-ffs/adb 0770 shell shell
- mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+ mount functionfs adb /dev/usb-ffs/adb noatime uid=2000,gid=2000,no_disconnect=1
mkdir /dev/usb-ffs/mtp 0770 mtp mtp
- mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
+ mount functionfs mtp /dev/usb-ffs/mtp noatime rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
write /sys/class/android_usb/android0/f_ffs/aliases adb,mtp
setprop sys.usb.ffs.max_write 262144
setprop sys.usb.ffs.max_read 262144
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 0503379..e6bd550 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -230,9 +230,6 @@
<!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
<bool translatable="false" name="config_wifi_dual_band_support">true</bool>
- <!-- Boolean indicating whether Hotspot 2.0/Passpoint and ANQP queries is enabled -->
- <bool translatable="false" name="config_wifi_hotspot2_enabled">true</bool>
-
<!-- Boolean indicating whether the wifi chipset has background scan support -->
<bool translatable="false" name="config_wifi_background_scan_support">true</bool>
diff --git a/sensorhal/sensorlist.cpp b/sensorhal/sensorlist.cpp
index 07218e3..60dccda 100644
--- a/sensorhal/sensorlist.cpp
+++ b/sensorhal/sensorlist.cpp
@@ -26,7 +26,8 @@ const int kVersion = 1;
const float kMinSampleRateHzAccel = 6.250f;
const float kMaxSampleRateHzAccel = 400.0f;
-extern const float kScaleAccel = (8.0f * 9.81f / 32768.0f);
+const float kAccelRangeG = 16.0f;
+extern const float kScaleAccel = (kAccelRangeG * 9.81f / 32768.0f);
const float kMinSampleRateHzGyro = 6.250f;
const float kMaxSampleRateHzGyro = 400.0f;
@@ -119,8 +120,8 @@ extern const sensor_t kSensorList[] = {
kVersion,
COMMS_SENSOR_ACCEL,
SENSOR_TYPE_ACCELEROMETER,
- GRAVITY_EARTH * 8.0f, // maxRange
- GRAVITY_EARTH * 8.0f / 32768.0f, // resolution
+ GRAVITY_EARTH * kAccelRangeG, // maxRange
+ GRAVITY_EARTH * kAccelRangeG / 32768.0f, // resolution
0.0f, // XXX power
(int32_t)(1.0E6f / kMaxSampleRateHzAccel), // minDelay
3000, // XXX fifoReservedEventCount
@@ -515,8 +516,8 @@ extern const sensor_t kSensorList[] = {
kVersion,
COMMS_SENSOR_ACCEL_UNCALIBRATED,
SENSOR_TYPE_ACCELEROMETER_UNCALIBRATED,
- GRAVITY_EARTH * 8.0f, // maxRange
- GRAVITY_EARTH * 8.0f / 32768.0f, // resolution
+ GRAVITY_EARTH * kAccelRangeG, // maxRange
+ GRAVITY_EARTH * kAccelRangeG / 32768.0f, // resolution
0.0f, // XXX power
(int32_t)(1.0E6f / kMaxSampleRateHzAccel), // minDelay
3000, // XXX fifoReservedEventCount
diff --git a/sepolicy/rild.te b/sepolicy/rild.te
index 52f0919..daca0fe 100644
--- a/sepolicy/rild.te
+++ b/sepolicy/rild.te
@@ -25,3 +25,7 @@ allow rild vendor_file:file { lock };
# allow rild to use qualcomm's socket ipc ioctls
allow rild self:socket ioctl;
allowxperm rild self:socket ioctl msm_sock_ipc_ioctls;
+
+# allow rild to access radio data file
+allow rild radio_data_file:dir rw_dir_perms;
+allow rild radio_data_file:file create_file_perms;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 22:43:10 +0000