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

Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev

Browse Source 
am: 9352329ee1

Change-Id: I51c19df8f9ad2832102a126778fbc5927d61f094
This commit is contained in:
Andrii Kulian
2017-09-02 00:31:22 +00:00
committed by android-build-merger
parent f30414e02a 9352329ee1
commit e68942db8e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityView.java
View File

@@ -232,8 +232,8 @@ public class ActivityView extends ViewGroup {
private class SurfaceCallback implements SurfaceHolder.Callback {
@Override
public void surfaceCreated(SurfaceHolder surfaceHolder) {
mSurface = mSurfaceView.getHolder().getSurface();
if (mVirtualDisplay == null) {
mSurface = mSurfaceView.getHolder().getSurface();
initVirtualDisplay();
if (mVirtualDisplay != null && mActivityViewCallback != null) {
mActivityViewCallback.onActivityViewReady(ActivityView.this);