Merge "Camera service: Clean up dump() command indenting." (aadc3369) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+143 −142

Original line number	Diff line number	Diff line
		@@ -2750,7 +2750,9 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) {
		getCallingPid(),
		getCallingUid());
		write(fd, result.string(), result.size());
		} else {
		return NO_ERROR;
		}

		bool locked = tryLock(mServiceLock);
		// failed to lock - CameraService is probably deadlocked
		if (!locked) {
		@@ -2920,7 +2922,6 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) {
		}
		}
		}
		}
		return NO_ERROR;
		}