diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
index 22455ad39960c..25c2e406f43cb 100644
--- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
+++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
@@ -3322,8 +3322,8 @@ public class StatsPullAtomService extends SystemService {
                         public void run() {
                             try {
                                 estimateAppOpsSamplingRate();
-                            } catch (Exception e) {
-                                Slog.e(TAG, "AppOps sampling ratio estimation failed");
+                            } catch (Throwable e) {
+                                Slog.e(TAG, "AppOps sampling ratio estimation failed: ", e);
                                 synchronized (mAppOpsSamplingRateLock) {
                                     mAppOpsSamplingRate = min(mAppOpsSamplingRate, 10);
                                 }
@@ -3364,7 +3364,7 @@ public class StatsPullAtomService extends SystemService {
                         Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(),
                         Long.MAX_VALUE).setFlags(
                         OP_FLAGS_PULLED).build();
-        appOps.getHistoricalOps(histOpsRequest, mContext.getMainExecutor(), ops::complete);
+        appOps.getHistoricalOps(histOpsRequest, AsyncTask.THREAD_POOL_EXECUTOR, ops::complete);
         HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,
                 TimeUnit.MILLISECONDS);
         List<AppOpEntry> opsList =