Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev

2017-07-28 17:03:49 +00:00
parent 129ed98650 d53a3128e8
commit 51fb9ad956
2 changed files with 12 additions and 1 deletions
--- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
@@ -104,4 +104,15 @@ public class ActionBarShadowControllerTest {
        verify(mRecyclerView, times(2)).addOnScrollListener(any());
    }

+    @Test
+    public void onScrolled_nullAnchorViewAndActivity_shouldNotCrash() {
+        final Activity activity = null;
+        final ActionBarShadowController controller =
+                ActionBarShadowController.attachToRecyclerView(activity, mLifecycle, mRecyclerView);
+
+        // Scroll
+        controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
+        // no crash
+    }
+
 }