Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203cbd6a authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Remove unused code related to 'surface_leak_fix' 

Flag: EXEMPT removal of 'surface_leak_fix'
Bug: 365555183
Test: Successful build
Change-Id: Idb2d79e0b643c657c2af2b5ca56fcec290f8c7b9
parent b0488e29

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -19760,7 +19760,7 @@ package android.hardware.camera2 { 














  public final class CaptureRequest extends android.hardware.camera2.CameraMetadata<android.hardware.camera2.CaptureRequest.Key<?>> implements android.os.Parcelable {















    method public int describeContents();













    method @FlaggedApi("com.android.internal.camera.flags.surface_leak_fix") protected void finalize();













    method protected void finalize();















    method @Nullable public <T> T get(android.hardware.camera2.CaptureRequest.Key<T>);















    method @NonNull public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getKeys();















    method @Nullable public Object getTag();

























core/java/android/hardware/camera2/CaptureRequest.java



+1
−4




























Original line number
Diff line number
Diff line








@@ -612,9 +612,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













            Parcelable[] parcelableArray = in.readParcelableArray(Surface.class.getClassLoader(),















                    Surface.class);















            if (parcelableArray != null) {













                if (Flags.surfaceLeakFix()) {















                mReleaseSurfaces = true;













                }















                for (Parcelable p : parcelableArray) {















                    Surface s = (Surface) p;















                    mSurfaceSet.add(s);










@@ -798,7 +796,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













    }































    @SuppressWarnings("Finalize")













    @FlaggedApi(Flags.FLAG_SURFACE_LEAK_FIX)















    @Override















    protected void finalize() {















        if (mReleaseSurfaces) {

































core/java/android/hardware/camera2/extension/SessionProcessor.java



+11
−15




























Original line number
Diff line number
Diff line








@@ -372,11 +372,9 @@ public abstract class SessionProcessor {













                Map<String, CameraMetadataNative> charsMap, OutputSurface previewSurface,















                OutputSurface imageCaptureSurface, OutputSurface postviewSurface)















                throws RemoteException {













            if (Flags.surfaceLeakFix()) {















            mPreviewSurface = previewSurface;















            mPostviewSurface = postviewSurface;















            mImageCaptureSurface = imageCaptureSurface;













            }















            ExtensionConfiguration config = SessionProcessor.this.initSession(token, cameraId,















                    new CharacteristicsMap(charsMap),















                    new CameraOutputSurface(previewSurface),









@@ -399,7 +397,6 @@ public abstract class SessionProcessor {













        @Override















        public void deInitSession(IBinder token) throws RemoteException {















            SessionProcessor.this.deInitSession(token);













            if (Flags.surfaceLeakFix()) {















            if ((mPreviewSurface != null) && (mPreviewSurface.surface != null)) {















                mPreviewSurface.surface.release();















            }









@@ -410,7 +407,6 @@ public abstract class SessionProcessor {













                mPostviewSurface.surface.release();















            }















        }













        }































        @Override















        public void onCaptureSessionStart(IRequestProcessorImpl requestProcessor, String statsKey)

































packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java



+8
−10




























Original line number
Diff line number
Diff line








@@ -1643,7 +1643,6 @@ public class CameraExtensionsProxyService extends Service {













            CameraExtensionsProxyService.unregisterDeathRecipient(mToken, this);















            mSessionProcessor.deInitSession();





























            if (Flags.surfaceLeakFix()) {















            if (mOutputImageCaptureSurfaceImpl.mSurface != null) {















                mOutputImageCaptureSurfaceImpl.mSurface.release();















            }









@@ -1654,7 +1653,6 @@ public class CameraExtensionsProxyService extends Service {













                mOutputPostviewSurfaceImpl.mSurface.release();















            }















        }













        }































        @Override















        public void onCaptureSessionStart(IRequestProcessorImpl requestProcessor, String statsKey) {