Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1f6f5d8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "networkprovider" am: 78ff9fe2 am: 5eed2ca1

Change-Id: Ib256b5b4a710f4f28f214d614cc2c03014459a55
parents 4f6e318f 5eed2ca1
Loading
Loading
Loading
Loading
+0 −9
Original line number Original line Diff line number Diff line
@@ -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);
            }
            }
        };
        };