Snap for 11139387 from 648bf6839563b8f2c88b7d274d9ab6d52e5452ef to 24Q1-release (7b171144) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -755,6 +755,13 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "android.hardware.usb.flags-aconfig-java-host",
		aconfig_declarations: "android.hardware.usb.flags-aconfig",
		host_supported: true,
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// WindowingTools
		aconfig_declarations {
		name: "android.tracing.flags-aconfig",

Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,9 @@ filegroup {
		// For the generated R.java and Manifest.java
		":framework-res{.aapt.srcjar}",

		// Java/AIDL sources to be moved out to CrashRecovery module
		":framework-crashrecovery-sources",

		// etc.
		":framework-javastream-protos",
		":statslog-framework-java-gen", // FrameworkStatsLog.java

apct-tests/perftests/windowmanager/src/android/wm/InternalWindowOperationPerfTest.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -52,9 +52,8 @@ public class InternalWindowOperationPerfTest extends WindowManagerPerfTestBase
		private final TraceMarkParser mTraceMarkParser = new TraceMarkParser(
		"applyPostLayoutPolicy",
		"applySurfaceChanges",
		"AppTransitionReady",
		"closeSurfaceTransaction",
		"openSurfaceTransaction",
		"onTransactionReady",
		"applyTransaction",
		"performLayout",
		"performSurfacePlacement",
		"prepareSurfaces",

cmds/bootanimation/BootAnimation.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -675,7 +675,11 @@ ui::Rotation BootAnimation::parseOrientationProperty() {
		ss << "ro.bootanim.set_orientation_" << displayId.value;
		return ss.str();
		}();
		const auto syspropValue = android::base::GetProperty(syspropName, "ORIENTATION_0");
		auto syspropValue = android::base::GetProperty(syspropName, "");
		if (syspropValue == "") {
		syspropValue = android::base::GetProperty("ro.bootanim.set_orientation_logical_0", "");
		}

		if (syspropValue == "ORIENTATION_90") {
		return ui::ROTATION_90;
		} else if (syspropValue == "ORIENTATION_180") {

cmds/uinput/jni/com_android_commands_uinput_Device.cpp

+12 −11

Original line number	Diff line number	Diff line
		@@ -96,9 +96,9 @@ JNIEnv* DeviceCallback::getJNIEnv() {
		return env;
		}

		std::unique_ptr<UinputDevice> UinputDevice::open(int32_t id, const char* name, int32_t vid,
		int32_t pid, uint16_t bus, uint32_t ffEffectsMax,
		const char* port,
		std::unique_ptr<UinputDevice> UinputDevice::open(int32_t id, const char* name, int32_t vendorId,
		int32_t productId, int32_t versionId, uint16_t bus,
		uint32_t ffEffectsMax, const char* port,
		std::unique_ptr<DeviceCallback> callback) {
		android::base::unique_fd fd(::open(UINPUT_PATH, O_RDWR \| O_NONBLOCK \| O_CLOEXEC));
		if (!fd.ok()) {
		@@ -118,8 +118,9 @@ std::unique_ptr<UinputDevice> UinputDevice::open(int32_t id, const char* name, i
		strlcpy(setupDescriptor.name, name, UINPUT_MAX_NAME_SIZE);
		setupDescriptor.id.version = 1;
		setupDescriptor.id.bustype = bus;
		setupDescriptor.id.vendor = vid;
		setupDescriptor.id.product = pid;
		setupDescriptor.id.vendor = vendorId;
		setupDescriptor.id.product = productId;
		setupDescriptor.id.version = versionId;
		setupDescriptor.ff_effects_max = ffEffectsMax;

		// Request device configuration.
		@@ -242,9 +243,9 @@ std::vector<int32_t> toVector(JNIEnv* env, jintArray javaArray) {
		return data;
		}

		static jlong openUinputDevice(JNIEnv* env, jclass /* clazz */, jstring rawName, jint id, jint vid,
		jint pid, jint bus, jint ffEffectsMax, jstring rawPort,
		jobject callback) {
		static jlong openUinputDevice(JNIEnv* env, jclass /* clazz */, jstring rawName, jint id,
		jint vendorId, jint productId, jint versionId, jint bus,
		jint ffEffectsMax, jstring rawPort, jobject callback) {
		ScopedUtfChars name(env, rawName);
		if (name.c_str() == nullptr) {
		return 0;
		@@ -255,8 +256,8 @@ static jlong openUinputDevice(JNIEnv* env, jclass /* clazz */, jstring rawName,
		std::make_unique<uinput::DeviceCallback>(env, callback);

		std::unique_ptr<uinput::UinputDevice> d =
		uinput::UinputDevice::open(id, name.c_str(), vid, pid, bus, ffEffectsMax, port.c_str(),
		std::move(cb));
		uinput::UinputDevice::open(id, name.c_str(), vendorId, productId, versionId, bus,
		ffEffectsMax, port.c_str(), std::move(cb));
		return reinterpret_cast<jlong>(d.release());
		}

		@@ -326,7 +327,7 @@ static jint getEvdevInputPropByLabel(JNIEnv* env, jclass /* clazz */, jstring ra

		static JNINativeMethod sMethods[] = {
		{"nativeOpenUinputDevice",
		"(Ljava/lang/String;IIIIILjava/lang/String;"
		"(Ljava/lang/String;IIIIIILjava/lang/String;"
		"Lcom/android/commands/uinput/Device$DeviceCallback;)J",
		reinterpret_cast<void*>(openUinputDevice)},
		{"nativeInjectEvent", "(JIII)V", reinterpret_cast<void*>(injectEvent)},