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

Merge "Add null check around mImeRequester.getWindow()" into sc-dev am: 7c2b1d57db

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

Change-Id: Iefbd0fe0df64e469984fdf59e3bac49d4c504909
This commit is contained in:
TreeHugger Robot
2021-04-22 20:25:36 +00:00
committed by Automerger Merge Worker
parent fb3f11c42e 7c2b1d57db
commit 76a397a3d2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java
View File

@@ -257,8 +257,10 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider {
void dumpDebug(ProtoOutputStream proto, long fieldId, @WindowTraceLogLevel int logLevel) {
final long token = proto.start(fieldId);
super.dumpDebug(proto, INSETS_SOURCE_PROVIDER, logLevel);
if (mImeRequester != null) {
mImeRequester.getWindow().dumpDebug(proto, IME_TARGET_FROM_IME, logLevel);
final WindowState imeRequesterWindow =
mImeRequester != null ? mImeRequester.getWindow() : null;
if (imeRequesterWindow != null) {
imeRequesterWindow.dumpDebug(proto, IME_TARGET_FROM_IME, logLevel);
}
proto.write(IS_IME_LAYOUT_DRAWN, mIsImeLayoutDrawn);
proto.end(token);