Merge "Removed ViewTreeObserver null checks"

1 files changed, 17 insertions, 20 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index f877fc8..43f8790 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5043,15 +5043,13 @@ public class WebView extends AbsoluteLayout
         super.onAttachedToWindow();
         if (hasWindowFocus()) setActive(true);
         final ViewTreeObserver treeObserver = getViewTreeObserver();
-        if (treeObserver != null) {
-            if (mGlobalLayoutListener == null) {
-                mGlobalLayoutListener = new InnerGlobalLayoutListener();
-                treeObserver.addOnGlobalLayoutListener(mGlobalLayoutListener);
-            }
-            if (mScrollChangedListener == null) {
-                mScrollChangedListener = new InnerScrollChangedListener();
-                treeObserver.addOnScrollChangedListener(mScrollChangedListener);
-            }
+        if (mGlobalLayoutListener == null) {
+            mGlobalLayoutListener = new InnerGlobalLayoutListener();
+            treeObserver.addOnGlobalLayoutListener(mGlobalLayoutListener);
+        }
+        if (mScrollChangedListener == null) {
+            mScrollChangedListener = new InnerScrollChangedListener();
+            treeObserver.addOnScrollChangedListener(mScrollChangedListener);
         }
 
         addAccessibilityApisToJavaScript();
@@ -5064,15 +5062,13 @@ public class WebView extends AbsoluteLayout
         if (hasWindowFocus()) setActive(false);
 
         final ViewTreeObserver treeObserver = getViewTreeObserver();
-        if (treeObserver != null) {
-            if (mGlobalLayoutListener != null) {
-                treeObserver.removeGlobalOnLayoutListener(mGlobalLayoutListener);
-                mGlobalLayoutListener = null;
-            }
-            if (mScrollChangedListener != null) {
-                treeObserver.removeOnScrollChangedListener(mScrollChangedListener);
-                mScrollChangedListener = null;
-            }
+        if (mGlobalLayoutListener != null) {
+            treeObserver.removeGlobalOnLayoutListener(mGlobalLayoutListener);
+            mGlobalLayoutListener = null;
+        }
+        if (mScrollChangedListener != null) {
+            treeObserver.removeOnScrollChangedListener(mScrollChangedListener);
+            mScrollChangedListener = null;
         }
 
         removeAccessibilityApisFromJavaScript();
@@ -5106,8 +5102,7 @@ public class WebView extends AbsoluteLayout
 
     /**
      * @deprecated WebView should not have implemented
-     * ViewTreeObserver.OnGlobalFocusChangeListener.  This method
-     * does nothing now.
+     * ViewTreeObserver.OnGlobalFocusChangeListener. This method does nothing now.
      */
     @Deprecated
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
@@ -7758,6 +7753,7 @@ public class WebView extends AbsoluteLayout
             int     mEnabled;
             int     mId;
 
+            @Override
             public String toString() {
                 return mString;
             }
@@ -8222,6 +8218,7 @@ public class WebView extends AbsoluteLayout
      * zero to make the view transparent.
      * @param color   the ARGB color described by Color.java
      */
+    @Override
     public void setBackgroundColor(int color) {
         mBackgroundColor = color;
         mWebViewCore.sendMessage(EventHub.SET_BACKGROUND_COLOR, color);