LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing function MapNotNull

Browse Source 
MapNotNull is not a standard TS/JS function

Test: compile winscope and open any file
Bug: 167522376
Change-Id: I796d96eb963627bd3a872dea9dea51c7eaa97e8c
This commit is contained in:
Nataniel Borges
2021-02-24 19:48:28 +01:00
parent 7c80f35be8
commit 24e39c5c4c
7 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/winscope/src/flickerlib/WindowManagerState.ts
View File

@@ -86,7 +86,8 @@ function newWindowManagerPolicy(proto): WindowManagerPolicy {
function newRootWindowContainer(proto): RootWindowContainer { function newRootWindowContainer(proto): RootWindowContainer {
const children = proto.windowContainer.children.reverse() 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( const windowContainer = WindowContainer.fromProto(
{proto: proto.windowContainer, children: children}) {proto: proto.windowContainer, children: children})
if (windowContainer == null) { if (windowContainer == null) {

3
tools/winscope/src/flickerlib/windows/Activity.ts
View File

@@ -24,7 +24,8 @@ Activity.fromProto = function (proto): Activity {
return null return null
} else { } else {
const children = proto.windowToken.windowContainer.children.reverse() 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, const windowContainer = WindowContainer.fromProto({proto: proto.windowToken.windowContainer,
children: children, identifierOverride: proto.identifier}) children: children, identifierOverride: proto.identifier})
if (windowContainer == null) { if (windowContainer == null) {

3
tools/winscope/src/flickerlib/windows/ActivityTask.ts
View File

@@ -24,7 +24,8 @@ ActivityTask.fromProto = function (proto, isActivityInTree: Boolean): ActivityTa
return null return null
} else { } else {
const children = proto.windowContainer.children.reverse() 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, const windowContainer = WindowContainer.fromProto({proto: proto.windowContainer,
children: children}) children: children})
if (windowContainer == null) { if (windowContainer == null) {

3
tools/winscope/src/flickerlib/windows/DisplayArea.ts
View File

@@ -24,7 +24,8 @@ DisplayArea.fromProto = function (proto, isActivityInTree: Boolean): DisplayArea
return null return null
} else { } else {
const children = proto.windowContainer.children.reverse() 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, const windowContainer = WindowContainer.fromProto({proto: proto.windowContainer,
children: children, nameOverride: proto.name}) children: children, nameOverride: proto.name})
if (windowContainer == null) { if (windowContainer == null) {

3
tools/winscope/src/flickerlib/windows/DisplayContent.ts
View File

@@ -24,7 +24,8 @@ DisplayContent.fromProto = function (proto, isActivityInTree: Boolean): DisplayC
return null return null
} else { } else {
const children = proto.rootDisplayArea.windowContainer.children.reverse() 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, const windowContainer = WindowContainer.fromProto({proto: proto.rootDisplayArea.windowContainer,
children: children, nameOverride: proto.displayInfo?.name ?? null}) children: children, nameOverride: proto.displayInfo?.name ?? null})
if (windowContainer == null) { if (windowContainer == null) {

3
tools/winscope/src/flickerlib/windows/WindowState.ts
View File

@@ -43,7 +43,8 @@ import WindowContainer from "./WindowContainer"
} }
const children = proto.windowContainer.children.reverse() 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({ const windowContainer = WindowContainer.fromProto({
proto: proto.windowContainer, proto: proto.windowContainer,

3
tools/winscope/src/flickerlib/windows/WindowToken.ts
View File

@@ -25,7 +25,8 @@ WindowToken.fromProto = function (proto, isActivityInTree: Boolean): WindowToken
} }
const children = proto.windowContainer.children.reverse() 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, const windowContainer = WindowContainer.fromProto({proto: proto.windowContainer,
children: children, tokenOverride: proto.hashCode}) children: children, tokenOverride: proto.hashCode})
if (windowContainer == null) { if (windowContainer == null) {