Snap for 8818610 from 45b540163a253e1e6afcd5d34db61457248dece5 to tm-qpr1-release (cd6f532a) · Commits · e / os / android_frameworks_base

core/java/android/window/WindowContainerTransaction.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -348,8 +348,10 @@ public final class WindowContainerTransaction implements Parcelable {
		* @param currentParent of the tasks to perform the operation no.
		* {@code null} will perform the operation on the display.
		* @param newParent for the tasks. {@code null} will perform the operation on the display.
		* @param windowingModes of the tasks to reparent.
		* @param activityTypes of the tasks to reparent.
		* @param windowingModes of the tasks to reparent. {@code null} ignore this attribute when
		* perform the operation.
		* @param activityTypes of the tasks to reparent. {@code null} ignore this attribute when
		* perform the operation.
		* @param onTop When {@code true}, the child goes to the top of parent; otherwise it goes to
		* the bottom.
		*/

+10 −11

Original line number	Diff line number	Diff line
		@@ -41,7 +41,12 @@ struct {

		static JNIEnv* getenv(JavaVM* vm) {
		JNIEnv* env;
		if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
		auto result = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
		if (result == JNI_EDETACHED) {
		if (vm->AttachCurrentThreadAsDaemon(&env, nullptr) != JNI_OK) {
		LOG_ALWAYS_FATAL("Failed to AttachCurrentThread!");
		}
		} else if (result != JNI_OK) {
		LOG_ALWAYS_FATAL("Failed to get JNIEnv for JavaVM: %p", vm);
		}
		return env;
		@@ -60,15 +65,15 @@ public:
		}

		~TransactionHangCallbackWrapper() {
		if (mTransactionHangObject) {
		getenv()->DeleteGlobalRef(mTransactionHangObject);
		if (mTransactionHangObject != nullptr) {
		getenv(mVm)->DeleteGlobalRef(mTransactionHangObject);
		mTransactionHangObject = nullptr;
		}
		}

		void onTransactionHang(bool isGpuHang) {
		if (mTransactionHangObject) {
		getenv()->CallVoidMethod(mTransactionHangObject,
		getenv(mVm)->CallVoidMethod(mTransactionHangObject,
		gTransactionHangCallback.onTransactionHang, isGpuHang);
		}
		}
		@@ -76,12 +81,6 @@ public:
		private:
		JavaVM* mVm;
		jobject mTransactionHangObject;

		JNIEnv* getenv() {
		JNIEnv* env;
		mVm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
		return env;
		}
		};

		static jlong nativeCreate(JNIEnv* env, jclass clazz, jstring jName,

+6 −6

Original line number	Diff line number	Diff line
		@@ -577,12 +577,6 @@
		"group": "WM_ERROR",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"-1521427940": {
		"message": "commitVisibility: %s: visible=%b mVisibleRequested=%b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/ActivityRecord.java"
		},
		"-1517908912": {
		"message": "requestScrollCapture: caught exception dispatching to window.token=%s",
		"level": "WARN",
		@@ -1513,6 +1507,12 @@
		"group": "WM_DEBUG_FOCUS_LIGHT",
		"at": "com\/android\/server\/wm\/DisplayContent.java"
		},
		"-636553602": {
		"message": "commitVisibility: %s: visible=%b visibleRequested=%b, isInTransition=%b, runningAnimation=%b, caller=%s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/ActivityRecord.java"
		},
		"-635082269": {
		"message": "******** booted=%b msg=%b haveBoot=%b haveApp=%b haveWall=%b wallEnabled=%b haveKeyguard=%b",
		"level": "INFO",

+6 −2

Original line number	Diff line number	Diff line
		@@ -829,9 +829,13 @@ class PhysicsAnimator<T> private constructor (target: T) {

		/** Cancels all in progress animations on all properties. */
		fun cancel() {
		if (flingAnimations.size > 0) {
		cancelAction(flingAnimations.keys)
		}
		if (springAnimations.size > 0) {
		cancelAction(springAnimations.keys)
		}
		}

		/** Cancels in progress animations on the provided properties only. */
		fun cancel(vararg properties: FloatPropertyCompat<in T>) {

+13 −1

Original line number	Diff line number	Diff line
		@@ -487,13 +487,25 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		private DividerSnapAlgorithm getSnapAlgorithm(Context context, Rect rootBounds,
		@Nullable Rect stableInsets) {
		final boolean isLandscape = isLandscape(rootBounds);
		final Rect insets = stableInsets != null ? stableInsets : getDisplayInsets(context);

		// Make split axis insets value same as the larger one to avoid bounds1 and bounds2
		// have difference after split switching for solving issues on non-resizable app case.
		if (isLandscape) {
		final int largerInsets = Math.max(insets.left, insets.right);
		insets.set(largerInsets, insets.top, largerInsets, insets.bottom);
		} else {
		final int largerInsets = Math.max(insets.top, insets.bottom);
		insets.set(insets.left, largerInsets, insets.right, largerInsets);
		}

		return new DividerSnapAlgorithm(
		context.getResources(),
		rootBounds.width(),
		rootBounds.height(),
		mDividerSize,
		!isLandscape,
		stableInsets != null ? stableInsets : getDisplayInsets(context),
		insets,
		isLandscape ? DOCKED_LEFT : DOCKED_TOP /* dockSide */);
		}