commit 93a4bf4b54058ffc8cbdc9321fd2d5c7b09acbef
author Vishal Hemnani <hemnani@google.com> Thu Aug 10 15:37:37 2017 -0700
committer Christine Hallstrom <hallstrom@google.com> Wed Apr 04 22:49:04 2018 +0000
tree 98df73b6375f641a9464a29c6b0c704935e8da80
parent 6e2469a99d1b4b993d2c28a207607961a0a07a2c

Add a null check on ActionBar since there isn't one present on Android
Wear devices.

Bug: 69375979
Bug: 64491917
Change-Id: I0758e3cd48a0bc2de7d33b3a48ea0ffae031823a
Fixes: 69375979
(cherry picked from commit 06fadfae96e54237e44f79e2a62b0522f7e8329f)

src/com/android/phone/settings/PhoneAccountSettingsActivity.java

diff --git a/src/com/android/phone/settings/PhoneAccountSettingsActivity.java b/src/com/android/phone/settings/PhoneAccountSettingsActivity.java
index 71ae8cf..56f5594 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsActivity.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.phone.settings;
 
+import android.app.ActionBar;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.MenuItem;
@@ -27,8 +28,10 @@
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        getActionBar().setTitle(R.string.phone_accounts);
+        final ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            actionBar.setTitle(R.string.phone_accounts);
+        }
         getFragmentManager().beginTransaction().replace(
                 android.R.id.content, new PhoneAccountSettingsFragment()).commit();
     }