From 6c82e04ceed70980f2294f936a7d24bf2c06bb37 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Thu, 3 Oct 2013 18:57:48 +0000 Subject: [PATCH] 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@4916 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/examples/android/project.properties | 2 ++ .../src/org/appspot/apprtc/AppRTCClient.java | 2 +- .../appspot/apprtc/AppRTCDemoActivity.java | 15 +++++++----- .../org/webrtc/videoengine/ViERenderer.java | 1 - .../test/android/android_video_demo.gypi | 1 + webrtc/video_engine/test/android/build.xml | 4 ++++ .../test/android/res/layout/both.xml | 2 +- .../org/webrtc/videoengineapp/WebRTCDemo.java | 24 ++++++------------- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/talk/examples/android/project.properties b/talk/examples/android/project.properties index a3ee5ab64f..bc163b0b2e 100644 --- a/talk/examples/android/project.properties +++ b/talk/examples/android/project.properties @@ -12,3 +12,5 @@ # Project target. target=android-17 + +java.compilerargs=-Xlint:all -Werror diff --git a/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java b/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java index fe41564373..6042dab93d 100644 --- a/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java +++ b/talk/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/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java index a6da552084..06192bc494 100644 --- a/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java +++ b/talk/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( diff --git a/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java b/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java index e2c9921dee..578bfa2d46 100644 --- a/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java +++ b/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java @@ -47,7 +47,6 @@ public class ViERenderer { public static SurfaceView CreateLocalRenderer(Context context) { SurfaceView localRender = new SurfaceView(context); g_localRenderer = localRender.getHolder(); - g_localRenderer.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS); return localRender; } diff --git a/webrtc/video_engine/test/android/android_video_demo.gypi b/webrtc/video_engine/test/android/android_video_demo.gypi index fa53e51102..868db96aa6 100644 --- a/webrtc/video_engine/test/android/android_video_demo.gypi +++ b/webrtc/video_engine/test/android/android_video_demo.gypi @@ -50,6 +50,7 @@ '<(PRODUCT_DIR)/lib.java/video_render_module_java.jar', '<(PRODUCT_DIR)/libwebrtc-video-demo-jni.so', ' + + + + diff --git a/webrtc/video_engine/test/android/res/layout/both.xml b/webrtc/video_engine/test/android/res/layout/both.xml index d29d9063fc..ab174ba4d0 100644 --- a/webrtc/video_engine/test/android/res/layout/both.xml +++ b/webrtc/video_engine/test/android/res/layout/both.xml @@ -20,7 +20,7 @@