PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash when an app requests Bluetooth to be discoverable

Browse Source 
* 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
This commit is contained in:
Jack He
2017-04-03 18:06:06 -07:00
parent b59337c0eb
commit ebbfce0bf1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/RequestPermissionActivity.java
View File

@@ -180,8 +180,8 @@ public class RequestPermissionActivity extends Activity implements
builder.setMessage(message); builder.setMessage(message);
} else { } else {
CharSequence message = mAppLabel != null CharSequence message = mAppLabel != null
? getString(R.string.bluetooth_ask_discovery, mAppLabel) ? getString(R.string.bluetooth_ask_discovery, mAppLabel, mTimeout)
: getString(R.string.bluetooth_ask_discovery_no_name); : getString(R.string.bluetooth_ask_discovery_no_name, mTimeout);
builder.setMessage(message); builder.setMessage(message);
} }
builder.setPositiveButton(getString(R.string.allow), this); builder.setPositiveButton(getString(R.string.allow), this);