diff -r bcacb829dc28 -r a2cad81f348b src/org/sipdroid/media/RtpStreamReceiver.java --- a/src/org/sipdroid/media/RtpStreamReceiver.java Tue Jun 05 16:44:38 2012 +0200 +++ b/src/org/sipdroid/media/RtpStreamReceiver.java Wed Jun 06 23:24:12 2012 +0200 @@ -24,24 +24,22 @@ import java.io.IOException; import java.net.SocketException; -import com.beem.project.beem.jingle.JingleService; -import com.beem.project.beem.ui.Call; import org.sipdroid.net.RtpPacket; import org.sipdroid.net.RtpSocket; import org.sipdroid.net.SipdroidSocket; import org.sipdroid.pjlib.Codec; -import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences.Editor; import android.media.AudioFormat; import android.media.AudioManager; import android.media.AudioTrack; import android.media.ToneGenerator; -import android.os.PowerManager; import android.os.RemoteException; import android.preference.PreferenceManager; -import android.provider.Settings; + +import com.beem.project.beem.jingle.JingleService; +import com.beem.project.beem.ui.Call; /** * RtpStreamReceiver is a generic stream receiver. It receives packets from RTP @@ -67,7 +65,6 @@ /** Whether it is running */ private boolean running; private AudioManager am; - private ContentResolver cr; public static int speakermode; private JingleService mJingle; @@ -194,12 +191,9 @@ int oldvibrate2 = am.getVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION); if (!PreferenceManager.getDefaultSharedPreferences(Call.mContext).contains("oldvibrate2")) oldvibrate2 = AudioManager.VIBRATE_SETTING_ON; - int oldpolicy = android.provider.Settings.System.getInt(cr, android.provider.Settings.System.WIFI_SLEEP_POLICY, - Settings.System.WIFI_SLEEP_POLICY_DEFAULT); Editor edit = PreferenceManager.getDefaultSharedPreferences(Call.mContext).edit(); edit.putInt("oldvibrate", oldvibrate); edit.putInt("oldvibrate2", oldvibrate2); - edit.putInt("oldpolicy", oldpolicy); edit.putInt("oldring",am.getStreamVolume(AudioManager.STREAM_RING)); edit.putBoolean("oldvalid", true); edit.commit(); @@ -223,21 +217,14 @@ public static void restoreSettings() { if (PreferenceManager.getDefaultSharedPreferences(Call.mContext).getBoolean("oldvalid",true)) { AudioManager am = (AudioManager) Call.mContext.getSystemService(Context.AUDIO_SERVICE); - ContentResolver cr = Call.mContext.getContentResolver(); int oldvibrate = PreferenceManager.getDefaultSharedPreferences(Call.mContext).getInt("oldvibrate",0); int oldvibrate2 = PreferenceManager.getDefaultSharedPreferences(Call.mContext).getInt("oldvibrate2",0); - int oldpolicy = PreferenceManager.getDefaultSharedPreferences(Call.mContext).getInt("oldpolicy",0); am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,oldvibrate); am.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,oldvibrate2); - Settings.System.putInt(cr, Settings.System.WIFI_SLEEP_POLICY, oldpolicy); setStreamVolume(AudioManager.STREAM_RING, PreferenceManager.getDefaultSharedPreferences(Call.mContext).getInt("oldring",0), 0); Editor edit = PreferenceManager.getDefaultSharedPreferences(Call.mContext).edit(); edit.putBoolean("oldvalid", false); edit.commit(); - PowerManager pm = (PowerManager) Call.mContext.getSystemService(Context.POWER_SERVICE); - PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | - PowerManager.ACQUIRE_CAUSES_WAKEUP, "Sipdroid.RtpStreamReceiver"); - wl.acquire(1000); } restoreMode(); } @@ -288,9 +275,8 @@ android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO); am = (AudioManager) Call.mContext.getSystemService(Context.AUDIO_SERVICE); - cr = Call.mContext.getContentResolver(); + Call.mContext.getContentResolver(); saveSettings(); - Settings.System.putInt(cr, Settings.System.WIFI_SLEEP_POLICY,Settings.System.WIFI_SLEEP_POLICY_NEVER); am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,AudioManager.VIBRATE_SETTING_OFF); am.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,AudioManager.VIBRATE_SETTING_OFF); int oldvol = am.getStreamVolume(AudioManager.STREAM_MUSIC);