Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Add missing null checks\" into nyc-dev

Browse Source 
am: 02e391585d

Change-Id: Idcba5c8393609034b70382844d499b45759b5e6d
This commit is contained in:
John Reck
2016-06-27 17:06:24 +00:00
committed by android-build-merger
parent 45f8aaca7c 02e391585d
commit 0fc8707e2d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/SurfaceView.java
View File

@@ -745,6 +745,12 @@ public class SurfaceView extends View {
Log.d(TAG, String.format("%d windowPositionLostRT RT, frameNr = %d",
System.identityHashCode(this), frameNumber));
}
IWindowSession session = mSession;
MyWindow window = mWindow;
if (session == null || window == null) {
// We got detached prior to receiving this, abort
return;
}
if (mRtHandlingPositionUpdates) {
mRtHandlingPositionUpdates = false;
// This callback will happen while the UI thread is blocked, so we can
@@ -757,7 +763,7 @@ public class SurfaceView extends View {
"postion = [%d, %d, %d, %d]", System.identityHashCode(this),
mWinFrame.left, mWinFrame.top,
mWinFrame.right, mWinFrame.bottom));
mSession.repositionChild(mWindow, mWinFrame.left, mWinFrame.top,
session.repositionChild(window, mWinFrame.left, mWinFrame.top,
mWinFrame.right, mWinFrame.bottom, frameNumber, mWinFrame);
} catch (RemoteException ex) {
Log.e(TAG, "Exception from relayout", ex);