Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix leakage of pointer location" into tm-qpr-dev am: 7f96bd5a88

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19465302

Change-Id: I822d4225329357df7ee34807f391f6956c721a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-03 11:36:56 +00:00
committed by Automerger Merge Worker
parent 49af33aef9 7f96bd5a88
commit cf7e8cb01f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/widget/PointerLocationView.java
View File

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

8
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

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