Merge "Fix NPE."

dsandler · Android (Google) Code Review · commit b07f6e09eac5 · 2011-09-14T18:56:12.000-07:00
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -112,7 +112,6 @@ public boolean onTouch(View v, MotionEvent ev) {
     };
 
     public void setDisabledFlags(int disabledFlags) {
-        Slog.d(TAG, "setDisabledFlags: " + disabledFlags);
         setDisabledFlags(disabledFlags, false);
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1091,7 +1091,7 @@ public void disable(int state) {
 
         if ((diff & (StatusBarManager.DISABLE_NAVIGATION | StatusBarManager.DISABLE_BACK)) != 0) {
             // the nav bar will take care of DISABLE_NAVIGATION and DISABLE_BACK
-            mNavigationBarView.setDisabledFlags(state);
+            if (mNavigationBarView != null) mNavigationBarView.setDisabledFlags(state);
 
             if ((state & StatusBarManager.DISABLE_NAVIGATION) != 0) {
                 // close recents if it's visible

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ public boolean onTouch(View v, MotionEvent ev) {`
`112`	`112`	`};`
`113`	`113`
`114`	`114`	`public void setDisabledFlags(int disabledFlags) {`
`115`		`- Slog.d(TAG, "setDisabledFlags: " + disabledFlags);`
`116`	`115`	`setDisabledFlags(disabledFlags, false);`
`117`	`116`	`}`
`118`	`117`