commit 1252d0bc3c1e2c16ad8d4f9ec4e913601ef7472a
author Mark Renouf <mrenouf@google.com> Tue Aug 18 11:35:19 2020 -0400
committer Mark Renouf <mrenouf@google.com> Thu Aug 20 00:55:29 2020 +0000
tree 7b63d3bd2801c6b250ff3106b3cd18ecf9dfc23b
parent 31308e2c173762247b8347a6a9e62cbd0a1ce93c

Fix missing null check in collectRootScrollCaptureTargets

If no window-level handlers have been added, the list is null
(lazily init).

Test: atest com.android.systemui.screenshot.ScrollCaptureTest

Change-Id: I39d4295cebb091fa89f65c5917ba08bc2396ed37

packages/SystemUI/tests/AndroidManifest.xml

diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml
index c6331682..db87845 100644
--- a/packages/SystemUI/tests/AndroidManifest.xml
+++ b/packages/SystemUI/tests/AndroidManifest.xml
@@ -80,6 +80,8 @@
                   android:excludeFromRecents="true"
                   />
 
+        <activity android:name="com.android.systemui.screenshot.ScrollViewActivity"
+                  android:exported="false" />
         <provider
             android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"
             tools:replace="android:authorities"