Merge "[Settings] Query historical data in background" into rvc-dev

1 files changed, 8 insertions, 1 deletions

diff --git a/src/com/android/settings/network/telephony/DataUsagePreferenceController.java b/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
index 035a8c1673..08524d67f8 100644
--- a/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
@@ -45,6 +45,7 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
 
     private Future<NetworkTemplate> mTemplateFuture;
     private AtomicReference<NetworkTemplate> mTemplate;
+    private Future<Long> mHistoricalUsageLevel;
 
     public DataUsagePreferenceController(Context context, String key) {
         super(context, key);
@@ -127,11 +128,17 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
         final DataUsageController controller = new DataUsageController(context);
         controller.setSubscriptionId(subId);
 
+        mHistoricalUsageLevel = ThreadUtils.postOnBackgroundThread(() ->
+                controller.getHistoricalUsageLevel(getNetworkTemplate()));
+
         final DataUsageController.DataUsageInfo usageInfo = getDataUsageInfo(controller);
 
         long usageLevel = usageInfo.usageLevel;
         if (usageLevel <= 0L) {
-            usageLevel = controller.getHistoricalUsageLevel(getNetworkTemplate());
+            try {
+                usageLevel = mHistoricalUsageLevel.get();
+            } catch (Exception exception) {
+            }
         }
         if (usageLevel <= 0L) {
             return null;