Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "networkprovider"

Browse Source 
am: 78ff9fe27a

Change-Id: I2caed5dd18f8a7d1bf3d9aad2ac4cac59b31e8be
This commit is contained in:
Lorenzo Colitti
2020-01-12 00:26:42 -08:00
committed by android-build-merger
parent 0b9e88d6dc 78ff9fe27a
commit 5eed2ca1ea
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/NetworkFactory.java
View File

@@ -146,13 +146,6 @@ public class NetworkFactory extends Handler {
mCapabilityFilter = filter; mCapabilityFilter = filter;
} }
private void assertOnLooperThread(Looper looper) {
if (Thread.currentThread().getId() != looper.getThread().getId()) {
throw new AssertionError("Unexpected thread: "
+ Thread.currentThread().getId() + " != " + looper.getThread().getId());
}
}
public void register() { public void register() {
if (mProvider != null) { if (mProvider != null) {
Log.e(LOG_TAG, "Ignoring attempt to register already-registered NetworkFactory"); Log.e(LOG_TAG, "Ignoring attempt to register already-registered NetworkFactory");
@@ -164,13 +157,11 @@ public class NetworkFactory extends Handler {
@Override @Override
public void onNetworkRequested(@NonNull NetworkRequest request, int score, public void onNetworkRequested(@NonNull NetworkRequest request, int score,
int servingFactoryProviderId) { int servingFactoryProviderId) {
assertOnLooperThread(getLooper());
handleAddRequest((NetworkRequest) request, score, servingFactoryProviderId); handleAddRequest((NetworkRequest) request, score, servingFactoryProviderId);
} }
@Override @Override
public void onRequestWithdrawn(@NonNull NetworkRequest request) { public void onRequestWithdrawn(@NonNull NetworkRequest request) {
assertOnLooperThread(getLooper());
handleRemoveRequest(request); handleRemoveRequest(request);
} }
}; };