Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa183f7a authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Fix a crash when an app requests Bluetooth to be discoverable am: ebbfce0b 

am: 4b27231f

Change-Id: Id383dca443a09dd25b520978b9fbe8f5791eb46f
parents 5a13d2fc 4b27231f

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

+2 −2
Original line number Diff line number Diff line
@@ -180,8 +180,8 @@ public class RequestPermissionActivity extends Activity implements 
                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);