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

Commit 25af46b0 authored by Heidi von Markham's avatar Heidi von Markham Committed by Android Git Automerger
Browse files

Merge branch 'mnc-dev' of... 

Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev
parents c37d84ac d3bc26a8

core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java

+2 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession { 
        if (mIsConstrainedHighSpeedSession) {

            if (!isConstrainedHighSpeedRequestList(requestList)) {

                throw new IllegalArgumentException("It is only allowed to submit a constrained "

                        + "high speed request list to a constrianed high speed session!!!");

                        + "high speed request list to a constrained high speed session!!!");

            }

        }

    }
@@ -761,8 +761,7 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession { 


    @Override

    public boolean isConstrainedHighSpeed() {

        // TODO: to be implemented

        return false;

        return mIsConstrainedHighSpeedSession;

    }



}