Snap for 11540345 from 08726fcf78a07498c7d7087586e341c73ff49819 to 24Q3-release (b776f4c3) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -3280,6 +3280,12 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid,
		// duration is logged into MYLOG instead.
		PrintHeader();

		bool system_trace_exists = access(SYSTEM_TRACE_SNAPSHOT, F_OK) == 0;
		if (options_->use_predumped_ui_data && !system_trace_exists) {
		MYLOGW("Ignoring 'use predumped data' flag because no predumped data is available");
		options_->use_predumped_ui_data = false;
		}

		std::future<std::string> snapshot_system_trace;

		bool is_dumpstate_restricted =

+6 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,12 @@ else
		exit 1
		fi

		if pm art on-ota-staged --slot "$TARGET_SLOT_SUFFIX"; then
		# Handled by Pre-reboot Dexopt.
		exit 0
		fi
		echo "Pre-reboot Dexopt not enabled. Fall back to otapreopt."

		if [ "$(/system/bin/otapreopt_chroot --version)" != 2 ]; then
		# We require an updated chroot wrapper that reads dexopt commands from stdin.
		# Even if we kept compat with the old binary, the OTA preopt wouldn't work due

+6 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,12 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.software.contextualsearch.prebuilt.xml",
		src: "android.software.contextualsearch.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.software.device_id_attestation.prebuilt.xml",
		src: "android.software.device_id_attestation.xml",

+16 −4

Original line number	Diff line number	Diff line
		@@ -662,10 +662,6 @@ public:

		inline void setActionButton(int32_t button) { mActionButton = button; }

		inline float getXOffset() const { return mTransform.tx(); }

		inline float getYOffset() const { return mTransform.ty(); }

		inline const ui::Transform& getTransform() const { return mTransform; }

		std::optional<ui::Rotation> getSurfaceRotation() const;
		@@ -880,6 +876,22 @@ public:

		void offsetLocation(float xOffset, float yOffset);

		/**
		* Get the X offset of this motion event relative to the origin of the raw coordinate space.
		*
		* In practice, this is the delta that was added to the raw screen coordinates (i.e. in logical
		* display space) to adjust for the absolute position of the containing windows and views.
		*/
		float getRawXOffset() const;

		/**
		* Get the Y offset of this motion event relative to the origin of the raw coordinate space.
		*
		* In practice, this is the delta that was added to the raw screen coordinates (i.e. in logical
		* display space) to adjust for the absolute position of the containing windows and views.
		*/
		float getRawYOffset() const;

		void scale(float globalScaleFactor);

		// Set 3x3 perspective matrix transformation.

+2 −2

Original line number	Diff line number	Diff line
		@@ -2976,14 +2976,14 @@ status_t Parcel::restartWrite(size_t desired)
		return continueWrite(desired);
		}

		releaseObjects();

		uint8_t* data = reallocZeroFree(mData, mDataCapacity, desired, mDeallocZero);
		if (!data && desired > mDataCapacity) {
		mError = NO_MEMORY;
		return NO_MEMORY;
		}

		releaseObjects();

		if (data \|\| desired == 0) {
		LOG_ALLOC("Parcel %p: restart from %zu to %zu capacity", this, mDataCapacity, desired);
		if (mDataCapacity > desired) {