Snap for 9455153 from 78c84d62bdc4ebe288c7cfaf6ddf9febc47d227d to udc-release (b5ba10da) · Commits · e / os / android_frameworks_native

cmds/installd/installd.rc

+1 −0

Original line number	Diff line number	Diff line

		service installd /system/bin/installd
		class main
		capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL SETGID SETUID SYS_ADMIN

		on early-boot
		mkdir /config/sdcardfs/extensions/1055

+0 −3

Original line number	Diff line number	Diff line
		@@ -566,9 +566,6 @@ pub struct ReadableSubParcel<'a> {
		impl<'a> ReadableSubParcel<'a> {
		/// Read a type that implements [`Deserialize`] from the sub-parcel.
		pub fn read<D: Deserialize>(&self) -> Result<D> {
		// The caller should have checked this,
		// but it can't hurt to double-check
		assert!(self.has_more_data());
		D::deserialize(&self.parcel)
		}

+3 −11

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ use crate::sys;
		use std::convert::{TryFrom, TryInto};
		use std::ffi::c_void;
		use std::mem::{self, ManuallyDrop, MaybeUninit};
		use std::os::raw::{c_char, c_ulong};
		use std::os::raw::c_char;
		use std::ptr;
		use std::slice;

		@@ -103,12 +103,8 @@ pub trait SerializeArray: Serialize + Sized {
		unsafe extern "C" fn serialize_element<T: Serialize>(
		parcel: *mut sys::AParcel,
		array: *const c_void,
		index: c_ulong,
		index: usize,
		) -> status_t {
		// c_ulong and usize are the same, but we need the explicitly sized version
		// so the function signature matches what bindgen generates.
		let index = index as usize;

		let slice: &[T] = slice::from_raw_parts(array.cast(), index + 1);

		let mut parcel = match BorrowedParcel::from_raw(parcel) {
		@@ -158,12 +154,8 @@ pub trait DeserializeArray: Deserialize {
		unsafe extern "C" fn deserialize_element<T: Deserialize>(
		parcel: *const sys::AParcel,
		array: *mut c_void,
		index: c_ulong,
		index: usize,
		) -> status_t {
		// c_ulong and usize are the same, but we need the explicitly sized version
		// so the function signature matches what bindgen generates.
		let index = index as usize;

		let vec = &mut (array as mut Option<Vec<MaybeUninit<T>>>);
		let vec = match vec {
		Some(v) => v,

+1 −1

Original line number	Diff line number	Diff line
		@@ -864,7 +864,7 @@ status_t RecoveryMap::appendRecoveryMap(jr_compressed_ptr compressed_jpeg_image,
		// 2 bytes: representing the length of the package
		// 29 bytes: length of name space "http://ns.adobe.com/xap/1.0/\0",
		// x bytes: length of xmp packet
		const int length = 3 + nameSpaceLength + xmp.size();
		const int length = 2 + nameSpaceLength + xmp.size();
		const uint8_t lengthH = ((length >> 8) & 0xff);
		const uint8_t lengthL = (length & 0xff);
		JPEGR_CHECK(Write(dest, &photos_editing_formats::image_io::JpegMarker::kStart, 1, pos));

+0 −16

Original line number	Diff line number	Diff line
		@@ -2508,10 +2508,6 @@ TEST_P(RefreshRateSelectorTest, getBestFrameRateMode_FractionalRefreshRates_Exac
		// b/190578904
		TEST_P(RefreshRateSelectorTest,
		getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_Heuristic) {
		if (g_noSlowTests) {
		GTEST_SKIP();
		}

		const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
		constexpr int kMaxRefreshRate = 240;

		@@ -2540,10 +2536,6 @@ TEST_P(RefreshRateSelectorTest,
		}
		TEST_P(RefreshRateSelectorTest,
		getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_ExplicitDefault) {
		if (g_noSlowTests) {
		GTEST_SKIP();
		}

		const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
		constexpr int kMaxRefreshRate = 240;

		@@ -2572,10 +2564,6 @@ TEST_P(RefreshRateSelectorTest,
		}
		TEST_P(RefreshRateSelectorTest,
		getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_ExplicitExactOrMultiple) {
		if (g_noSlowTests) {
		GTEST_SKIP();
		}

		const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
		constexpr int kMaxRefreshRate = 240;

		@@ -2604,10 +2592,6 @@ TEST_P(RefreshRateSelectorTest,
		}
		TEST_P(RefreshRateSelectorTest,
		getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_ExplicitExact) {
		if (g_noSlowTests) {
		GTEST_SKIP();
		}

		const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
		constexpr int kMaxRefreshRate = 240;