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

Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp

Browse Source
This commit is contained in:
Colin Cross
2019-04-16 03:35:51 +00:00
committed by Android (Google) Code Review
parent 5ccb19e418 e2abf3f5c6
commit 2e7a226e65
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/NetworkScanHelper.java
View File

@@ -31,6 +31,7 @@ import com.android.internal.telephony.CellNetworkScanResult;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -180,7 +181,7 @@ public class NetworkScanHelper {
int errCode = Integer.parseInt(t.getMessage()); int errCode = Integer.parseInt(t.getMessage());
onError(errCode); onError(errCode);
} }
}); }, MoreExecutors.directExecutor());
mExecutor.execute(new NetworkScanSyncTask( mExecutor.execute(new NetworkScanSyncTask(
mTelephonyManager, (SettableFuture) mNetworkScanFuture)); mTelephonyManager, (SettableFuture) mNetworkScanFuture));
} else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) { } else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {