commit d4cf0b689e3ad0baf29f7e2219ce052113dabb4d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 27 13:19:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 27 13:19:42 2019 +0000
tree c77241c0a1955d4bf29173bc7cde25544bc20765
parent 19508cbca0d3824e8aa9637a1f4b94b89f20fb35
parent f0526e4afb5f96934bd10612aac4748c3031ca54

Merge "Fix print page starts multiple activities"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ef5facf..84b14d0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2352,8 +2352,7 @@
         </activity>
         <activity
             android:name="Settings$MobileDataUsageListActivity"
-            android:label="@string/cellular_data_usage"
-            android:parentActivityName="Settings">
+            android:label="@string/cellular_data_usage">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MOBILE_DATA_USAGE" />
                 <category android:name="android.intent.category.DEFAULT" />

src/com/android/settings/fuelgauge/BatteryInfo.java

diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 34a8b91..ab03b65 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -160,7 +160,7 @@
                 callback.onBatteryInfoLoaded(batteryInfo);
                 BatteryUtils.logRuntime(LOG_TAG, "time for callback", startTime);
             }
-        }.execute();
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     public static BatteryInfo getBatteryInfo(final Context context,