From 24e39c5c4c31c3ab75a64ac13e56bb67404c33a9 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Wed, 24 Feb 2021 19:48:28 +0100 Subject: [PATCH] Fix missing function MapNotNull MapNotNull is not a standard TS/JS function Test: compile winscope and open any file Bug: 167522376 Change-Id: I796d96eb963627bd3a872dea9dea51c7eaa97e8c --- tools/winscope/src/flickerlib/WindowManagerState.ts | 3 ++- tools/winscope/src/flickerlib/windows/Activity.ts | 3 ++- tools/winscope/src/flickerlib/windows/ActivityTask.ts | 3 ++- tools/winscope/src/flickerlib/windows/DisplayArea.ts | 3 ++- tools/winscope/src/flickerlib/windows/DisplayContent.ts | 3 ++- tools/winscope/src/flickerlib/windows/WindowState.ts | 3 ++- tools/winscope/src/flickerlib/windows/WindowToken.ts | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/winscope/src/flickerlib/WindowManagerState.ts b/tools/winscope/src/flickerlib/WindowManagerState.ts index fd08b752d..2cb9ab3be 100644 --- a/tools/winscope/src/flickerlib/WindowManagerState.ts +++ b/tools/winscope/src/flickerlib/WindowManagerState.ts @@ -86,7 +86,8 @@ function newWindowManagerPolicy(proto): WindowManagerPolicy { function newRootWindowContainer(proto): RootWindowContainer { const children = proto.windowContainer.children.reverse() - .mapNotNull(it => WindowContainer.childrenFromProto(it, /* isActivityInTree */ false)) + .filter(it => it != null) + .map(it => WindowContainer.childrenFromProto(it, /* isActivityInTree */ false)) const windowContainer = WindowContainer.fromProto( {proto: proto.windowContainer, children: children}) if (windowContainer == null) { diff --git a/tools/winscope/src/flickerlib/windows/Activity.ts b/tools/winscope/src/flickerlib/windows/Activity.ts index d85adddda..0b8eb06b5 100644 --- a/tools/winscope/src/flickerlib/windows/Activity.ts +++ b/tools/winscope/src/flickerlib/windows/Activity.ts @@ -24,7 +24,8 @@ Activity.fromProto = function (proto): Activity { return null } else { const children = proto.windowToken.windowContainer.children.reverse() - .mapNotNull(it => WindowContainer.childrenFromProto(it, /* isActivityInTree */ true)) + .filter(it => it != null) + .map(it => WindowContainer.childrenFromProto(it, /* isActivityInTree */ true)) const windowContainer = WindowContainer.fromProto({proto: proto.windowToken.windowContainer, children: children, identifierOverride: proto.identifier}) if (windowContainer == null) { diff --git a/tools/winscope/src/flickerlib/windows/ActivityTask.ts b/tools/winscope/src/flickerlib/windows/ActivityTask.ts index f24877136..9bbe428ba 100644 --- a/tools/winscope/src/flickerlib/windows/ActivityTask.ts +++ b/tools/winscope/src/flickerlib/windows/ActivityTask.ts @@ -24,7 +24,8 @@ ActivityTask.fromProto = function (proto, isActivityInTree: Boolean): ActivityTa return null } else { const children = proto.windowContainer.children.reverse() - .mapNotNull(it => WindowContainer.childrenFromProto(it, isActivityInTree)) + .filter(it => it != null) + .map(it => WindowContainer.childrenFromProto(it, isActivityInTree)) const windowContainer = WindowContainer.fromProto({proto: proto.windowContainer, children: children}) if (windowContainer == null) { diff --git a/tools/winscope/src/flickerlib/windows/DisplayArea.ts b/tools/winscope/src/flickerlib/windows/DisplayArea.ts index 93c380e27..066e71698 100644 --- a/tools/winscope/src/flickerlib/windows/DisplayArea.ts +++ b/tools/winscope/src/flickerlib/windows/DisplayArea.ts @@ -24,7 +24,8 @@ DisplayArea.fromProto = function (proto, isActivityInTree: Boolean): DisplayArea return null } else { const children = proto.windowContainer.children.reverse() - .mapNotNull(it => WindowContainer.childrenFromProto(it, isActivityInTree)) + .filter(it => it != null) + .map(it => WindowContainer.childrenFromProto(it, isActivityInTree)) const windowContainer = WindowContainer.fromProto({proto: proto.windowContainer, children: children, nameOverride: proto.name}) if (windowContainer == null) { diff --git a/tools/winscope/src/flickerlib/windows/DisplayContent.ts b/tools/winscope/src/flickerlib/windows/DisplayContent.ts index c0228b261..bbb41c285 100644 --- a/tools/winscope/src/flickerlib/windows/DisplayContent.ts +++ b/tools/winscope/src/flickerlib/windows/DisplayContent.ts @@ -24,7 +24,8 @@ DisplayContent.fromProto = function (proto, isActivityInTree: Boolean): DisplayC return null } else { const children = proto.rootDisplayArea.windowContainer.children.reverse() - .mapNotNull(it => WindowContainer.childrenFromProto(it, isActivityInTree)) + .filter(it => it != null) + .map(it => WindowContainer.childrenFromProto(it, isActivityInTree)) const windowContainer = WindowContainer.fromProto({proto: proto.rootDisplayArea.windowContainer, children: children, nameOverride: proto.displayInfo?.name ?? null}) if (windowContainer == null) { diff --git a/tools/winscope/src/flickerlib/windows/WindowState.ts b/tools/winscope/src/flickerlib/windows/WindowState.ts index 40cc2bac7..41063e7a6 100644 --- a/tools/winscope/src/flickerlib/windows/WindowState.ts +++ b/tools/winscope/src/flickerlib/windows/WindowState.ts @@ -43,7 +43,8 @@ import WindowContainer from "./WindowContainer" } const children = proto.windowContainer.children.reverse() - .mapNotNull(it => WindowContainer.childrenFromProto(it, isActivityInTree)) + .filter(it => it != null) + .map(it => WindowContainer.childrenFromProto(it, isActivityInTree)) const windowContainer = WindowContainer.fromProto({ proto: proto.windowContainer, diff --git a/tools/winscope/src/flickerlib/windows/WindowToken.ts b/tools/winscope/src/flickerlib/windows/WindowToken.ts index c2ec00661..c3142f546 100644 --- a/tools/winscope/src/flickerlib/windows/WindowToken.ts +++ b/tools/winscope/src/flickerlib/windows/WindowToken.ts @@ -25,7 +25,8 @@ WindowToken.fromProto = function (proto, isActivityInTree: Boolean): WindowToken } const children = proto.windowContainer.children.reverse() - .mapNotNull(it => WindowContainer.childrenFromProto(it, isActivityInTree)) + .filter(it => it != null) + .map(it => WindowContainer.childrenFromProto(it, isActivityInTree)) const windowContainer = WindowContainer.fromProto({proto: proto.windowContainer, children: children, tokenOverride: proto.hashCode}) if (windowContainer == null) {