Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Unified Diff: remoting/android/java/src/org/chromium/chromoting/Chromoting.java

Issue 308793007: Fix Chromoting Android client crashed on launch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698