commit 3b1728642d980d2e895c85f61959e061fcb21772
author Sudheer Shanka <sudheersai@google.com> Tue Mar 21 06:31:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 21 06:31:21 2017 +0000
tree 4bc16542aa5796ad3ab7540eef7a721eae309cf6
parent ecf0582e7deb711b4bd718884a978f7c47a0cf65
parent 51ab3acf270c655ed90706895b43915433d022c7

Merge "Add lastProcStateSeqDispatchedToObservers to UidRecord."

core/java/android/view/SurfaceView.java

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 824e035..f559d42 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -479,6 +479,8 @@
                             "SurfaceView - " + viewRoot.getTitle().toString(),
                             mSurfaceWidth, mSurfaceHeight, mFormat,
                             mSurfaceFlags);
+                } else if (mSurfaceControl == null) {
+                    return;
                 }
 
                 boolean realSizeChanged = false;
@@ -625,7 +627,7 @@
                     }
                 }
             } catch (Exception ex) {
-                Log.e(TAG, "Exception from relayout", ex);
+                Log.e(TAG, "Exception configuring surface", ex);
             }
             if (DEBUG) Log.v(
                 TAG, "Layout: x=" + mScreenRect.left + " y=" + mScreenRect.top
@@ -662,7 +664,7 @@
                                 mScreenRect.right, mScreenRect.bottom));
                         setParentSpaceRectangle(mScreenRect, -1);
                     } catch (Exception ex) {
-                        Log.e(TAG, "Exception from relayout", ex);
+                        Log.e(TAG, "Exception configuring surface", ex);
                     }
                 }
             }
@@ -762,7 +764,7 @@
                             mScreenRect.right, mScreenRect.bottom));
                     setParentSpaceRectangle(mScreenRect, frameNumber);
                 } catch (Exception ex) {
-                    Log.e(TAG, "Exception from relayout", ex);
+                    Log.e(TAG, "Exception configuring surface", ex);
                 }
             }
             mRTLastReportedPosition.setEmpty();