summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-06-21 21:45:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-06-21 21:45:03 +0000
commit9893a89dbe2378736464b31c40090454e9a8c08e (patch)
tree5ea20d4d418818155628777fae1b98d7edd948a5 /java
parentaffbe0e40d99abd974ac0fd06ab368940b465598 (diff)
parent60754f4adf7eb2e18a5c311d73ae938406acd3b1 (diff)
Merge "Only throw expected exception when coalescing fails."
Diffstat (limited to 'java')
-rw-r--r--java/com/android/dialer/calllog/ui/NewCallLogFragment.java19
1 files changed, 13 insertions, 6 deletions
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
index ab0c22bcf..4141fe723 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
@@ -17,6 +17,7 @@ package com.android.dialer.calllog.ui;
import android.app.Activity;
import android.database.Cursor;
+import android.database.StaleDataException;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
@@ -336,12 +337,18 @@ public final class NewCallLogFragment extends Fragment implements LoaderCallback
}
},
throwable -> {
- // Coalescing can fail if the cursor passed to Coalescer is closed by the loader while
- // the work is still in progress.
- // This can happen when the loader restarts and finishes loading data before the
- // coalescing work is completed.
- // TODO(linyuh): throw an exception here if the failure above can be avoided.
- LogUtil.e("NewCallLogFragment.onLoadFinished", "coalescing failed", throwable);
+ if (throwable instanceof StaleDataException) {
+ // Coalescing can fail if the cursor passed to Coalescer is closed by the loader while
+ // the work is still in progress.
+ // This can happen when the loader restarts and finishes loading data before the
+ // coalescing work is completed.
+ // This failure doesn't need to be thrown as coalescing will be restarted on the latest
+ // data obtained by the loader.
+ // TODO(linyuh): Also throw an exception if the failure above can be avoided.
+ LogUtil.e("NewCallLogFragment.onLoadFinished", "coalescing failed", throwable);
+ } else {
+ throw new AssertionError(throwable);
+ }
});
}