From bb16e15de32f14c25728db39494c0cff9b80d186 Mon Sep 17 00:00:00 2001 From: "jhtop.kim" Date: Tue, 19 Jul 2011 20:25:02 +0900 Subject: [PATCH] Bluetooth : fix for crashing alertDialogbox - changes for crashing of alertDialogbox while displaying message - in showError function, this fix code shoud be added in case of showing error pop up Bug: 5068089 Change-Id: I40e8a699461832b7bd47080b40f467572632d412 Signed-off-by: jhtop.kim --- .../android/settings/bluetooth/LocalBluetoothManager.java | 4 ++++ src/com/android/settings/bluetooth/Utils.java | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/com/android/settings/bluetooth/LocalBluetoothManager.java mode change 100644 => 100755 src/com/android/settings/bluetooth/Utils.java diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java old mode 100644 new mode 100755 index 63b8b7ca23b..a1edca1015d --- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java @@ -79,6 +79,10 @@ public final class LocalBluetoothManager { return mContext; } + public Context getForegroundActivity() { + return mForegroundActivity; + } + boolean isForegroundActivity() { return mForegroundActivity != null; } diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java old mode 100644 new mode 100755 index 7d38e170065..01e72e010b7 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -89,11 +89,17 @@ final class Utils { static void showError(Context context, String name, int messageResId) { String message = context.getString(messageResId, name); - new AlertDialog.Builder(context) + LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context); + Context activity = manager.getForegroundActivity(); + if(manager.isForegroundActivity()) { + new AlertDialog.Builder(activity) .setIcon(android.R.drawable.ic_dialog_alert) .setTitle(R.string.bluetooth_error_title) .setMessage(message) .setPositiveButton(android.R.string.ok, null) .show(); + } else { + Toast.makeText(context, message, Toast.LENGTH_SHORT).show(); + } } }