PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Avoid from main UI thread blocking on accessing eSIM" into sc-qpr1-dev

Browse Source
This commit is contained in:
Bonian Chen
2021-09-16 19:08:09 +00:00
committed by Android (Google) Code Review
parent cb1969d46b 656c965222
commit 213c9ca658
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -84,6 +84,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
public class MobileNetworkUtils { public class MobileNetworkUtils {
@@ -258,9 +260,16 @@ public class MobileNetworkUtils {
public static boolean showEuiccSettings(Context context) { public static boolean showEuiccSettings(Context context) {
long timeForAccess = SystemClock.elapsedRealtime(); long timeForAccess = SystemClock.elapsedRealtime();
try { try {
return ((Future<Boolean>) ThreadUtils.postOnBackgroundThread(() Boolean isShow = ((Future<Boolean>) ThreadUtils.postOnBackgroundThread(() -> {
-> showEuiccSettingsDetecting(context))).get(); try {
} catch (ExecutionException | InterruptedException exception) { return showEuiccSettingsDetecting(context);
} catch (Exception threadException) {
Log.w(TAG, "Accessing Euicc failure", threadException);
}
return Boolean.FALSE;
})).get(3, TimeUnit.SECONDS);
return ((isShow != null) && isShow.booleanValue());
} catch (ExecutionException | InterruptedException | TimeoutException exception) {
timeForAccess = SystemClock.elapsedRealtime() - timeForAccess; timeForAccess = SystemClock.elapsedRealtime() - timeForAccess;
Log.w(TAG, "Accessing Euicc takes too long: +" + timeForAccess + "ms"); Log.w(TAG, "Accessing Euicc takes too long: +" + timeForAccess + "ms");
} }