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

Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c am: 170a632a66

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

Change-Id: Ibae90d867f896f4d4c611f5b2390dc0d5362a9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-09 06:08:04 +00:00
committed by Automerger Merge Worker
parent 4f30faa91c 170a632a66
commit f97d2d6f1d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/EthernetTetherPreferenceController.java
View File

@@ -26,6 +26,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.utils.ThreadUtils;
import java.util.HashSet; import java.util.HashSet;
@@ -74,7 +75,7 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen
@Override @Override
public boolean shouldEnable() { public boolean shouldEnable() {
ensureRunningOnMainLoopThread(); ThreadUtils.ensureMainThread();
String[] available = mTm.getTetherableIfaces(); String[] available = mTm.getTetherableIfaces();
for (String s : available) { for (String s : available) {
if (mAvailableInterfaces.contains(s)) { if (mAvailableInterfaces.contains(s)) {
@@ -94,11 +95,4 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen
return TetheringManager.TETHERING_ETHERNET; return TetheringManager.TETHERING_ETHERNET;
} }
private void ensureRunningOnMainLoopThread() {
if (Looper.getMainLooper().getThread() != Thread.currentThread()) {
throw new IllegalStateException(
"Not running on main loop thread: "
+ Thread.currentThread().getName());
}
}
} }