Snap for 7808903 from 0f6c1c9d2478927d6f93d69d8c38695d2a17c076 to sc-qpr1-d-release (11dd2697) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CaptureFailure.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class CaptureFailure {

		private final CaptureRequest mRequest;
		private final int mReason;
		private final boolean mDropped;
		private final boolean mWasImageCaptured;
		private final int mSequenceId;
		private final long mFrameNumber;
		private final String mErrorPhysicalCameraId;
		@@ -68,10 +68,11 @@ public class CaptureFailure {
		* @hide
		*/
		public CaptureFailure(CaptureRequest request, int reason,
		boolean dropped, int sequenceId, long frameNumber, String errorPhysicalCameraId) {
		boolean wasImageCaptured, int sequenceId, long frameNumber,
		String errorPhysicalCameraId) {
		mRequest = request;
		mReason = reason;
		mDropped = dropped;
		mWasImageCaptured = wasImageCaptured;
		mSequenceId = sequenceId;
		mFrameNumber = frameNumber;
		mErrorPhysicalCameraId = errorPhysicalCameraId;
		@@ -141,7 +142,7 @@ public class CaptureFailure {
		* @return boolean True if the image was captured, false otherwise.
		*/
		public boolean wasImageCaptured() {
		return !mDropped;
		return mWasImageCaptured;
		}

		/**

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

+34 −42

Original line number	Diff line number	Diff line
		@@ -873,7 +873,6 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		@Override
		public int submitBurst(List<Request> requests, IRequestCallback callback) {
		int seqId = -1;
		synchronized (mInterfaceLock) {
		try {
		CaptureCallbackHandler captureCallback = new CaptureCallbackHandler(callback);
		ArrayList<CaptureRequest> captureRequests = new ArrayList<>();
		@@ -888,7 +887,6 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		} catch (IllegalStateException e) {
		Log.e(TAG, "Capture session closed!");
		}
		}

		return seqId;
		}
		@@ -896,7 +894,6 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		@Override
		public int setRepeating(Request request, IRequestCallback callback) {
		int seqId = -1;
		synchronized (mInterfaceLock) {
		try {
		CaptureRequest repeatingRequest = initializeCaptureRequest(mCameraDevice,
		request, mCameraConfigMap);
		@@ -908,14 +905,12 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		} catch (IllegalStateException e) {
		Log.e(TAG, "Capture session closed!");
		}
		}

		return seqId;
		}

		@Override
		public void abortCaptures() {
		synchronized (mInterfaceLock) {
		try {
		mCaptureSession.abortCaptures();
		} catch (CameraAccessException e) {
		@@ -924,11 +919,9 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		Log.e(TAG, "Capture session closed!");
		}
		}
		}

		@Override
		public void stopRepeating() {
		synchronized (mInterfaceLock) {
		try {
		mCaptureSession.stopRepeating();
		} catch (CameraAccessException e) {
		@@ -938,7 +931,6 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		}
		}
		}
		}

		private static CaptureRequest initializeCaptureRequest(CameraDevice cameraDevice,
		Request request, HashMap<Surface, CameraOutputConfig> surfaceIdMap)

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1867,7 +1867,7 @@ public class CameraDeviceImpl extends CameraDevice
		final CaptureFailure failure = new CaptureFailure(
		request,
		reason,
		/dropped/ mayHaveBuffers,
		mayHaveBuffers,
		requestId,
		frameNumber,
		errorPhysicalCameraId);

services/core/java/com/android/server/location/provider/StationaryThrottlingLocationProvider.java

+8 −17

Original line number	Diff line number	Diff line
		@@ -105,15 +105,20 @@ public final class StationaryThrottlingLocationProvider extends DelegateLocation

		synchronized (mLock) {
		mDeviceIdleHelper.addListener(this);
		onDeviceIdleChanged(mDeviceIdleHelper.isDeviceIdle());
		mDeviceIdle = mDeviceIdleHelper.isDeviceIdle();
		mDeviceStationaryHelper.addListener(this);
		mDeviceStationary = false;
		mDeviceStationaryRealtimeMs = Long.MIN_VALUE;

		onThrottlingChangedLocked(false);
		}
		}

		@Override
		protected void onStop() {
		synchronized (mLock) {
		mDeviceStationaryHelper.removeListener(this);
		mDeviceIdleHelper.removeListener(this);
		onDeviceIdleChanged(false);

		mIncomingRequest = ProviderRequest.EMPTY_REQUEST;
		mOutgoingRequest = ProviderRequest.EMPTY_REQUEST;
		@@ -146,27 +151,13 @@ public final class StationaryThrottlingLocationProvider extends DelegateLocation
		}

		mDeviceIdle = deviceIdle;

		if (deviceIdle) {
		// device stationary helper will deliver an immediate listener update
		mDeviceStationaryHelper.addListener(this);
		} else {
		mDeviceStationaryHelper.removeListener(this);
		mDeviceStationary = false;
		mDeviceStationaryRealtimeMs = Long.MIN_VALUE;
		onThrottlingChangedLocked(false);
		}
		}
		}

		@Override
		public void onDeviceStationaryChanged(boolean deviceStationary) {
		synchronized (mLock) {
		if (!mDeviceIdle) {
		// stationary detection is only registered while idle - ignore late notifications
		return;
		}

		if (mDeviceStationary == deviceStationary) {
		return;
		}