diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-01-05 15:37:33 -0800 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2012-01-05 17:00:48 -0800 |
commit | d72992e05197948b7b5bc96146362f6c6c5fcb46 (patch) | |
tree | 84bcdfb0e9b0ce0c5d9d93f5c12ce2e35311499b | |
parent | 334791a4fd29daa13b59af84a352ba297798e7fd (diff) | |
download | LegacyCamera-d72992e05197948b7b5bc96146362f6c6c5fcb46.zip LegacyCamera-d72992e05197948b7b5bc96146362f6c6c5fcb46.tar.gz LegacyCamera-d72992e05197948b7b5bc96146362f6c6c5fcb46.tar.bz2 |
Use default volume control stream instead of the music stream.
Since the Camera API is moving back to using the system audio stream,
do not override the camera app volume control stream any more.
Bug: 5778365
Change-Id: I27a6a1769d39cb0b246bce7d721d846f6c1430d1
-rw-r--r-- | src/com/android/camera/ActivityBase.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/camera/ActivityBase.java b/src/com/android/camera/ActivityBase.java index ea523c8..e399421 100644 --- a/src/com/android/camera/ActivityBase.java +++ b/src/com/android/camera/ActivityBase.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.hardware.Camera; -import android.media.AudioManager; import android.os.Bundle; import android.util.Log; import android.view.KeyEvent; @@ -48,7 +47,6 @@ abstract public class ActivityBase extends Activity { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); } super.onCreate(icicle); - setVolumeControlStream(AudioManager.STREAM_MUSIC); } @Override |