Merge "Fix leakage of pointer location" into tm-qpr-dev (7f96bd5a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/PointerLocationView.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -828,6 +828,8 @@ public class PointerLocationView extends View implements InputDeviceListener,
		mSystemGestureExclusionListener, mContext.getDisplayId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		} catch (IllegalArgumentException e) {
		Log.e(TAG, "Failed to unregister window manager callbacks", e);
		}
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -2933,7 +2933,10 @@ public class DisplayPolicy {
		return;
		}

		if (!mDisplayContent.isRemoved()) {
		mDisplayContent.unregisterPointerEventListener(mPointerLocationView);
		}

		final WindowManager wm = mContext.getSystemService(WindowManager.class);
		wm.removeView(mPointerLocationView);
		mPointerLocationView = null;
		@@ -2958,6 +2961,9 @@ public class DisplayPolicy {
		mHandler.post(mGestureNavigationSettingsObserver::unregister);
		mHandler.post(mForceShowNavBarSettingsObserver::unregister);
		mImmersiveModeConfirmation.release();
		if (mService.mPointerLocationEnabled) {
		setPointerLocationEnabled(false);
		}
		}

		@VisibleForTesting