commit 714dc8abf840185c9ed6e506f29cee596a001beb
author Ernie Hsu <erniehsu@google.com> Wed Aug 28 23:33:40 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 28 23:33:40 2024 +0000
tree df68a3170ba8697fbb980d169afc556c8d6a8dce
parent a8910cb36b406fc1ad256691da41737a2e36bb10
parent d35b61f3905bea1dfe1c8cb37c2b2e50c98b4d26

Merge "mediacodec: fix perfetto trace permission" into main

bootctrl/aidl/BootControl.cpp

diff --git a/bootctrl/aidl/BootControl.cpp b/bootctrl/aidl/BootControl.cpp
index 83deb72..8655929 100644
--- a/bootctrl/aidl/BootControl.cpp
+++ b/bootctrl/aidl/BootControl.cpp
@@ -384,7 +384,7 @@
         *_aidl_return = true;
         return ScopedAStatus::ok();
     }
-    if (in_slot >= slots)
+    if (in_slot < 0 || in_slot >= slots)
         return ScopedAStatus::fromServiceSpecificErrorWithMessage(
                 INVALID_SLOT, (std::string("Invalid slot ") + std::to_string(in_slot)).c_str());
 

touch/gti/ical/sepolicy/property.te

diff --git a/touch/gti/ical/sepolicy/property.te b/touch/gti/ical/sepolicy/property.te
index 2a71d74..94fa3fc 100644
--- a/touch/gti/ical/sepolicy/property.te
+++ b/touch/gti/ical/sepolicy/property.te
@@ -1 +1,2 @@
 system_public_prop(vendor_gti_prop)
+typeattribute vendor_gti_prop         touch_property_type;