From a56454645ff5718074101d4eda8e891ef04d4d92 Mon Sep 17 00:00:00 2001
From: Aga Madurska <amad@google.com>
Date: Fri, 12 Aug 2016 10:17:49 +0100
Subject: [PATCH] Avoid an NPE while checking view location on screen.

Bug:30483148

Change-Id: I115da4fefff5fecc04135e2b150e1e77445cb86e
---
 core/java/android/view/View.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index fc250f269271..163f8550c059 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -23859,7 +23859,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * on the screen.
      */
     private boolean shouldDrawRoundScrollbar() {
-        if (!mResources.getConfiguration().isScreenRound()) {
+        if (!mResources.getConfiguration().isScreenRound() || mAttachInfo == null) {
             return false;
         }
 
-- 
2.11.0