From d72992e05197948b7b5bc96146362f6c6c5fcb46 Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Thu, 5 Jan 2012 15:37:33 -0800
Subject: 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
---
 src/com/android/camera/ActivityBase.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/com/android/camera')

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
-- 
cgit v1.1