Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8

Change-Id: I2c921a91564d672b6705668251486ff0b700e198

src/com/android/settings/notification/history/HistoryLoader.java

@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
+import android.util.Slog;
 
 import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.utils.ThreadUtils;
@@ -33,6 +34,7 @@ import java.util.List;
 import java.util.Map;
 
 public class HistoryLoader {
+    private static final String TAG = "HistoryLoader";
     private final Context mContext;
     private final NotificationBackend mBackend;
     private final PackageManager mPm;
@@ -45,10 +47,10 @@ public class HistoryLoader {
 
     public void load(OnHistoryLoaderListener listener) {
         ThreadUtils.postOnBackgroundThread(() -> {
+            try {
                 Map<String, NotificationHistoryPackage> historicalNotifications = new HashMap<>();
                 NotificationHistory history =
                         mBackend.getNotificationHistory(mContext.getPackageName());
-
                 while (history.hasNextNotification()) {
                     HistoricalNotification hn = history.getNextNotification();
 
@@ -84,6 +86,9 @@ public class HistoryLoader {
                     }
                 }
                 ThreadUtils.postOnMainThread(() -> listener.onHistoryLoaded(packages));
+            } catch (Exception e) {
+                Slog.e(TAG, "Error loading history", e);
+            }
         });
     }