Bug 1251923 - TabQueueService: Treat BadTokenException like SecurityException. r?margaret draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Fri, 04 Mar 2016 16:01:59 +0100
changeset 336947 152399db5417b0ecf8200e88e93697becafb9693
parent 336932 e082689e684d1bac1255f29786befe907fbf5942
child 515531 5e09a7781ccd24e53c5a0d7dbbaf67afc9ad9495
push id12218
push users.kaspari@gmail.com
push dateFri, 04 Mar 2016 15:02:30 +0000
reviewersmargaret
bugs1251923
milestone47.0a1
Bug 1251923 - TabQueueService: Treat BadTokenException like SecurityException. r?margaret MozReview-Commit-ID: qTtRaQuZyo
mobile/android/base/java/org/mozilla/gecko/tabqueue/TabQueueService.java
--- a/mobile/android/base/java/org/mozilla/gecko/tabqueue/TabQueueService.java
+++ b/mobile/android/base/java/org/mozilla/gecko/tabqueue/TabQueueService.java
@@ -172,17 +172,17 @@ public class TabQueueService extends Ser
         if (stopServiceRunnable != null) {
             // If we're already displaying a toast, keep displaying it but store the previous url.
             // The open button will refer to the most recently opened link.
             tabQueueHandler.removeCallbacks(stopServiceRunnable);
             stopServiceRunnable.run(false);
         } else {
             try {
                 windowManager.addView(toastLayout, toastLayoutParams);
-            } catch (final SecurityException e) {
+            } catch (final SecurityException | WindowManager.BadTokenException e) {
                 Toast.makeText(this, getText(R.string.tab_queue_toast_message), Toast.LENGTH_SHORT).show();
                 showSettingsNotification();
             }
         }
 
         stopServiceRunnable = new StopServiceRunnable(startId) {
             @Override
             public void onRun() {