diff options
| author | lambroslambrou <lambroslambrou@chromium.org> | 2014-10-15 20:01:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 03:02:01 +0000 |
| commit | 5b154b85bfd98f1d657821c3404c2e563fd31d85 (patch) | |
| tree | 51885780fd8e4b7b91717a99804e55d211e00d12 /remoting | |
| parent | 17abbb90ed7ffdf075c3199cec89a8252e107b10 (diff) | |
| download | chromium_src-5b154b85bfd98f1d657821c3404c2e563fd31d85.zip chromium_src-5b154b85bfd98f1d657821c3404c2e563fd31d85.tar.gz chromium_src-5b154b85bfd98f1d657821c3404c2e563fd31d85.tar.bz2 | |
Chromoting Android: Fix getActionBar() NullPointerException
s/getActionBar/getSupportActionBar in Desktop.java which uses
ActionBarActivity from the support library.
BUG=423875
Review URL: https://codereview.chromium.org/655243004
Cr-Commit-Position: refs/heads/master@{#299827}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/android/java/src/org/chromium/chromoting/Desktop.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java index 9dc00e1..501f6dd 100644 --- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java +++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java @@ -140,7 +140,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil public void showActionBar() { mOverlayButton.setVisibility(View.INVISIBLE); - getActionBar().show(); + getSupportActionBar().show(); View decorView = getWindow().getDecorView(); decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE); @@ -149,7 +149,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil @SuppressLint("InlinedApi") public void hideActionBar() { mOverlayButton.setVisibility(View.VISIBLE); - getActionBar().hide(); + getSupportActionBar().hide(); View decorView = getWindow().getDecorView(); |