diff options
| author | Chris Gross <chrisgross@google.com> | 2020-11-05 04:49:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-05 04:49:54 +0000 |
| commit | 53b9724c91ca241f30ffd6eeb49ee171298ee47b (patch) | |
| tree | 820e853ac9c73f8559859cb52c955cfd21362330 /native/android/surface_control.cpp | |
| parent | 6e69904a3cd0eb23298b314217f9d5dee3235eb1 (diff) | |
| parent | 80cf14f0899fd7f7c0911ad04bc95bd8f0d00829 (diff) | |
Merge changes from topic "SP1A.201015.001" into s-keystone-qcom-dev
* changes:
Adapt to IMS changes.
Merge SP1A.201015.001
Diffstat (limited to 'native/android/surface_control.cpp')
| -rw-r--r-- | native/android/surface_control.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 0af6cbf3cb40..0a466f424cec 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -317,10 +317,9 @@ void ASurfaceTransaction_reparent(ASurfaceTransaction* aSurfaceTransaction, sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl); sp<SurfaceControl> newParentSurfaceControl = ASurfaceControl_to_SurfaceControl( newParentASurfaceControl); - sp<IBinder> newParentHandle = (newParentSurfaceControl)? newParentSurfaceControl->getHandle() : nullptr; Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); - transaction->reparent(surfaceControl, newParentHandle); + transaction->reparent(surfaceControl, newParentSurfaceControl); } void ASurfaceTransaction_setVisibility(ASurfaceTransaction* aSurfaceTransaction, |