Merge "build: Wipe DTB/O OBJs before build" into android-13.0
diff --git a/build/core/qcom_utils.mk b/build/core/qcom_utils.mk
index a24aeef..df2ce4f 100755
--- a/build/core/qcom_utils.mk
+++ b/build/core/qcom_utils.mk
@@ -30,6 +30,7 @@
QCOM_BOARD_PLATFORMS += sm8250
QCOM_BOARD_PLATFORMS += lahaina
QCOM_BOARD_PLATFORMS += sm8350
+QCOM_BOARD_PLATFORMS += taro
MSM7K_BOARD_PLATFORMS := msm7630_surf
MSM7K_BOARD_PLATFORMS += msm7630_fusion
diff --git a/overlay/common/packages/apps/Settings/res/values/dimens.xml b/overlay/common/packages/apps/Settings/res/values/dimens.xml
new file mode 100644
index 0000000..1ead18e
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- was <dimen name="homepage_preference_min_height">88sp</dimen>
+ but it makes no sense at all to use sp (scaled by user prefs font size) for that -->
+ <dimen name="homepage_preference_min_height">48dp</dimen>
+</resources>
diff --git a/sepolicy/private/update_engine.te b/sepolicy/private/update_engine.te
index a0d1cf5..912729d 100644
--- a/sepolicy/private/update_engine.te
+++ b/sepolicy/private/update_engine.te
@@ -1,5 +1,6 @@
r_dir_file(update_engine, mnt_user_file)
r_dir_file(update_engine, storage_file)
+r_dir_file(update_engine, fuse)
allow update_engine self:capability { chown fsetid dac_read_search };
allow update_engine self:process { setexec };
@@ -36,6 +37,5 @@
allow update_engine vendor_overlay_file:file { getattr read };
allow update_engine linkerconfig_file:dir { getattr };
allow update_engine update_engine:capability { kill };
-allow update_engine fuse:file r_file_perms;
allow update_engine otadexopt_service:service_manager find;
binder_call(update_engine, platform_app)