Index: remoting/android/java/src/org/chromium/chromoting/Chromoting.java |
diff --git a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java |
index dd9088807f19a777e46bde5cb2e7c08029ec57ad..29aec73ad2138033e74434c650e7ad4d44400a1f 100644 |
--- a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java |
+++ b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java |
@@ -19,7 +19,6 @@ import android.content.DialogInterface; |
import android.content.Intent; |
import android.content.SharedPreferences; |
import android.content.res.Configuration; |
-import android.os.Build; |
import android.os.Bundle; |
import android.provider.Settings; |
import android.util.Log; |
@@ -397,8 +396,9 @@ public class Chromoting extends Activity implements JniInterface.ConnectionListe |
* Updates the infotext and host list display. |
*/ |
private void updateUi() { |
- mRefreshButton.setEnabled(mAccount != null); |
- |
+ if (mRefreshButton != null) { |
Lambros
2014/06/02 17:07:22
Looks like there's a race between updateUi() and o
|
+ mRefreshButton.setEnabled(mAccount != null); |
+ } |
ArrayAdapter<HostInfo> displayer = new HostListAdapter(this, R.layout.host, mHosts); |
Log.i("hostlist", "About to populate host list display"); |
mHostListView.setAdapter(displayer); |