Merge "Avoid an NPE while checking view location on screen." into cw-f-dev

This commit is contained in:
Agnieszka Madurska
2016-08-12 18:08:23 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
}