Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: move inline tests for being on emulator into a static method

Browse source
This commit is contained in:
Eric House 2015-11-17 07:19:37 -08:00
parent a2e00794fa
commit 8626fdf027
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java
View file

@ -87,7 +87,7 @@ public class CommsTransport implements TransportProcs,
m_done = false; m_done = false;
boolean failed = true; boolean failed = true;
try { try {
if ( Build.PRODUCT.contains("sdk") ) { if ( XWApp.onEmulator() ) {
System.setProperty("java.net.preferIPv6Addresses", "false"); System.setProperty("java.net.preferIPv6Addresses", "false");
} }

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetStateCache.java
View file

@ -48,7 +48,7 @@ public class NetStateCache {
private static boolean s_netAvail = false; private static boolean s_netAvail = false;
private static boolean s_isWifi; private static boolean s_isWifi;
private static PvtBroadcastReceiver s_receiver; private static PvtBroadcastReceiver s_receiver;
private static final boolean s_onSim = Build.PRODUCT.contains("sdk"); private static final boolean s_onSim = XWApp.onEmulator();
public static void register( Context context, StateChangedIf proc ) public static void register( Context context, StateChangedIf proc )
{ {

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
View file

@ -112,7 +112,8 @@ public class XWApp extends Application {
public static boolean onEmulator() public static boolean onEmulator()
{ {
if ( null == s_onEmulator ) { if ( null == s_onEmulator ) {
s_onEmulator = new Boolean( "google_sdk".equals(Build.MODEL) ); s_onEmulator = new Boolean( "google_sdk".equals(Build.MODEL)
|| Build.PRODUCT.startsWith("vbox") );
} }
return s_onEmulator; return s_onEmulator;
} }