commit 2cfeb1ac3964f5947d983f93f487ee811508d34a
author Craig Mautner <cmautner@google.com> Mon Jul 21 21:35:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 21 15:42:19 2014 +0000
tree 2e184824121dc45914751fbf56989e1d743e532e
parent 603862517569cbebed9a7bd231c3fb80292d4bcd
parent 3d0c57a1d3b8eb6bb54045c02c2e93a9313d3cf7

Merge "Don't create a delegate for null callbacks." into lmp-dev

core/java/android/hardware/display/DisplayManagerGlobal.java

diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java
index f2426e5..1b9a0c5 100644
--- a/core/java/android/hardware/display/DisplayManagerGlobal.java
+++ b/core/java/android/hardware/display/DisplayManagerGlobal.java
@@ -471,22 +471,30 @@
         private VirtualDisplayCallbacksDelegate mDelegate;
 
         public VirtualDisplayCallbacks(VirtualDisplay.Callbacks callbacks, Handler handler) {
-            mDelegate = new VirtualDisplayCallbacksDelegate(callbacks, handler);
+            if (callbacks != null) {
+                mDelegate = new VirtualDisplayCallbacksDelegate(callbacks, handler);
+            }
         }
 
         @Override // Binder call
         public void onDisplayPaused() {
-            mDelegate.sendEmptyMessage(VirtualDisplayCallbacksDelegate.MSG_DISPLAY_PAUSED);
+            if (mDelegate != null) {
+                mDelegate.sendEmptyMessage(VirtualDisplayCallbacksDelegate.MSG_DISPLAY_PAUSED);
+            }
         }
 
         @Override // Binder call
         public void onDisplayResumed() {
-            mDelegate.sendEmptyMessage(VirtualDisplayCallbacksDelegate.MSG_DISPLAY_RESUMED);
+            if (mDelegate != null) {
+                mDelegate.sendEmptyMessage(VirtualDisplayCallbacksDelegate.MSG_DISPLAY_RESUMED);
+            }
         }
 
         @Override // Binder call
         public void onDisplayStopped() {
-            mDelegate.sendEmptyMessage(VirtualDisplayCallbacksDelegate.MSG_DISPLAY_STOPPED);
+            if (mDelegate != null) {
+                mDelegate.sendEmptyMessage(VirtualDisplayCallbacksDelegate.MSG_DISPLAY_STOPPED);
+            }
         }
     }
 
@@ -505,9 +513,6 @@
 
         @Override
         public void handleMessage(Message msg) {
-            if (mCallbacks == null) {
-                return;
-            }
             switch (msg.what) {
                 case MSG_DISPLAY_PAUSED:
                     mCallbacks.onDisplayPaused();