Merge "Fix shutter sound cannot enable." into pi-dev (065df1d7) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Camera.java

+29 −14

Original line number	Diff line number	Diff line
		@@ -1660,23 +1660,29 @@ public class Camera {
		* @see ShutterCallback
		*/
		public final boolean enableShutterSound(boolean enabled) {
		if (!enabled) {
		boolean canDisableShutterSound = true;
		IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);
		IAudioService audioService = IAudioService.Stub.asInterface(b);
		try {
		if (audioService.isCameraSoundForced()) return false;
		if (audioService.isCameraSoundForced()) {
		canDisableShutterSound = false;
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Audio service is unavailable for queries");
		}
		if (!enabled && !canDisableShutterSound) {
		return false;
		}
		synchronized (mShutterSoundLock) {
		if (enabled && mHasAppOpsPlayAudio) {
		mShutterSoundEnabledFromApp = enabled;
		// Return the result of _enableShutterSound(enabled) in all cases.
		// If the shutter sound can be disabled, disable it when the device is in DnD mode.
		boolean ret = _enableShutterSound(enabled);
		if (enabled && !mHasAppOpsPlayAudio) {
		Log.i(TAG, "Shutter sound is not allowed by AppOpsManager");
		return false;
		if (canDisableShutterSound) {
		_enableShutterSound(false);
		}
		boolean ret = _enableShutterSound(enabled);
		if (ret) {
		mShutterSoundEnabledFromApp = enabled;
		}
		return ret;
		}
		@@ -1739,9 +1745,18 @@ public class Camera {
		}
		if (oldHasAppOpsPlayAudio != mHasAppOpsPlayAudio) {
		if (!mHasAppOpsPlayAudio) {
		IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);
		IAudioService audioService = IAudioService.Stub.asInterface(b);
		try {
		if (audioService.isCameraSoundForced()) {
		return;
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Audio service is unavailable for queries");
		}
		_enableShutterSound(false);
		} else {
		_enableShutterSound(mShutterSoundEnabledFromApp);
		enableShutterSound(mShutterSoundEnabledFromApp);
		}
		}
		}