From 324ae35aadd63d5e7762dd292f5987db4b2e989b Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Thu, 3 Oct 2013 18:57:48 +0000 Subject: Android standalone: remove some usages of deprecated APIs and prevent further regressions. Also: - Fixed WebRTCDemo UI to say "SwitchToBack" at startup since default camera is front - Rebuild WebRTCDemo APK when resources/layout/strings change R=henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2337004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@4916 4adac7df-926f-26a2-2b94-8c16560cd09d --- examples/android/src/org/appspot/apprtc/AppRTCClient.java | 2 +- .../src/org/appspot/apprtc/AppRTCDemoActivity.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'examples/android/src/org/appspot/apprtc') diff --git a/examples/android/src/org/appspot/apprtc/AppRTCClient.java b/examples/android/src/org/appspot/apprtc/AppRTCClient.java index fe41564..6042dab 100644 --- a/examples/android/src/org/appspot/apprtc/AppRTCClient.java +++ b/examples/android/src/org/appspot/apprtc/AppRTCClient.java @@ -301,7 +301,7 @@ public class AppRTCClient { JSONArray mandatoryKeys = mandatoryJSON.names(); if (mandatoryKeys != null) { for (int i = 0; i < mandatoryKeys.length(); ++i) { - String key = (String) mandatoryKeys.getString(i); + String key = mandatoryKeys.getString(i); String value = mandatoryJSON.getString(key); constraints.mandatory.add( new MediaConstraints.KeyValuePair(key, value)); diff --git a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java index a6da552..06192bc 100644 --- a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java +++ b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java @@ -36,6 +36,7 @@ import android.media.AudioManager; import android.os.Bundle; import android.os.PowerManager; import android.util.Log; +import android.view.WindowManager; import android.webkit.JavascriptInterface; import android.widget.EditText; import android.widget.Toast; @@ -96,10 +97,8 @@ public class AppRTCDemoActivity extends Activity Thread.setDefaultUncaughtExceptionHandler( new UnhandledExceptionHandler(this)); - PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); - wakeLock = powerManager.newWakeLock( - PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "AppRTCDemo"); - wakeLock.acquire(); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); Point displaySize = new Point(); getWindowManager().getDefaultDisplay().getSize(displaySize); @@ -111,9 +110,13 @@ public class AppRTCDemoActivity extends Activity AudioManager audioManager = ((AudioManager) getSystemService(AUDIO_SERVICE)); - audioManager.setMode(audioManager.isWiredHeadsetOn() ? + // TODO(fischman): figure out how to do this Right(tm) and remove the + // suppression. + @SuppressWarnings("deprecation") + boolean isWiredHeadsetOn = audioManager.isWiredHeadsetOn(); + audioManager.setMode(isWiredHeadsetOn ? AudioManager.MODE_IN_CALL : AudioManager.MODE_IN_COMMUNICATION); - audioManager.setSpeakerphoneOn(!audioManager.isWiredHeadsetOn()); + audioManager.setSpeakerphoneOn(!isWiredHeadsetOn); sdpMediaConstraints = new MediaConstraints(); sdpMediaConstraints.mandatory.add(new MediaConstraints.KeyValuePair( -- cgit v1.2.3