commit ebbfce0bf1cebf74525c9cceeeedcd1fe6012b60
author Jack He <siyuanh@google.com> Mon Apr 03 18:06:06 2017 -0700
committer Jack He <siyuanh@google.com> Tue Apr 04 01:53:20 2017 +0000
tree 7ccfa15634a986f3543f17f6ed6c887e9995a142
parent b59337c0eb5dcf52b9074e8fbbde2802ffb51d50

Fix a crash when an app requests Bluetooth to be discoverable

* When an app requests Bluetooth to be discoverable with a timeout and a
  non null EXTRA_PACKAGE_NAME, Settings app should put in the correct
  timeout values in the dialog string

Bug: 36870303
Test: make, try making Bluetooth discoverable via
      ACTION_REQUEST_DISCOVERABLE intent

Change-Id: I0cebc2f20371c9de5f28feb26425422c0777aa45

src/com/android/settings/bluetooth/RequestPermissionActivity.java

diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 20788c9..d2e2060 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -180,8 +180,8 @@
                 builder.setMessage(message);
             } else {
                 CharSequence message = mAppLabel != null
-                        ? getString(R.string.bluetooth_ask_discovery, mAppLabel)
-                        : getString(R.string.bluetooth_ask_discovery_no_name);
+                        ? getString(R.string.bluetooth_ask_discovery, mAppLabel, mTimeout)
+                        : getString(R.string.bluetooth_ask_discovery_no_name, mTimeout);
                 builder.setMessage(message);
             }
             builder.setPositiveButton(getString(R.string.allow), this);