generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 79285346-> 79320771

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7647 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-11-06 09:22:08 +00:00
parent 6340acde68
commit 0ef890a4ba
5 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/examples/android/src/org/appspot/apprtc/ConnectActivity.java
View File

@@ -73,7 +73,6 @@ public class ConnectActivity extends Activity {
private String keyprefUrl;
private String keyprefResolution;
private String keyprefFps;
private String keyprefCpuUsageDetection;
private String keyprefRoom;
private String keyprefRoomList;
private ArrayList<String> roomList;
@@ -89,7 +88,6 @@ public class ConnectActivity extends Activity {
keyprefUrl = getString(R.string.pref_url_key);
keyprefResolution = getString(R.string.pref_resolution_key);
keyprefFps = getString(R.string.pref_fps_key);
keyprefCpuUsageDetection = getString(R.string.pref_cpu_usage_detection_key);
keyprefRoom = getString(R.string.pref_room_key);
keyprefRoomList = getString(R.string.pref_room_list_key);
@@ -254,14 +252,6 @@ public class ConnectActivity extends Activity {
url += "&hd=true";
}
}
// Test if CpuOveruseDetection should be disabled. By default is on.
boolean cpuOveruseDetection = sharedPref.getBoolean(
keyprefCpuUsageDetection,
Boolean.valueOf(
getString(R.string.pref_cpu_usage_detection_default)));
if (!cpuOveruseDetection) {
url += "&googCpuOveruseDetection=false";
}
// TODO(kjellander): Add support for custom parameters to the URL.
connectToRoom(url);
}