commit 5e2b7f15e8b178700fcbf3ec629a222b0d3d04a8
author Zhen Sun <zhensun@google.com> Mon Jun 19 16:10:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 19 16:10:30 2017 +0000
tree a912929e4fe2633489e0244d1aaabee51160b556
parent d1b401106b6eeea1cda80a29cbc06eb4692a8a92
parent 40609a57f18593f1eafe0a0c8837cc01948711ee

Merge "Fix crash of setting device name on device w/o BT" into oc-dev
am: 40609a57f1

Change-Id: I5726494f0baba0f3e6028438e1306c6817274be2

Settings/src/com/android/tv/settings/name/DeviceManager.java

diff --git a/Settings/src/com/android/tv/settings/name/DeviceManager.java b/Settings/src/com/android/tv/settings/name/DeviceManager.java
index 7a4fa7b..ad5fe78 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceManager.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceManager.java
@@ -21,9 +21,12 @@
 import android.content.Intent;
 import android.provider.Settings;
 import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
 
 public class DeviceManager {
 
+    private static final String TAG = "DeviceManager";
+
     public static final String ACTION_DEVICE_NAME_UPDATE =
             "com.android.tv.settings.name.DeviceManager.DEVICE_NAME_UPDATE";
     /**
@@ -47,7 +50,12 @@
      */
     public static void setDeviceName(Context context, String name) {
         Settings.Global.putString(context.getContentResolver(), Settings.Global.DEVICE_NAME, name);
-        BluetoothAdapter.getDefaultAdapter().setName(name);
+        BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (btAdapter != null) {
+            btAdapter.setName(name);
+        } else {
+            Log.v(TAG, "Bluetooth adapter is null. Running on device without bluetooth?");
+        }
         LocalBroadcastManager.getInstance(context)
                 .sendBroadcast(new Intent(ACTION_DEVICE_NAME_UPDATE));
     }