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

Commit f8caad74 authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Ensure that ScanInfo is cached before callbacks fire" am: af740606 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1864976

Change-Id: Ib30acb95f8dd10f8f78c24c681c7541c9241ec7e
parents 0a3a353e af740606

telephony/java/android/telephony/TelephonyScanManager.java

+18 −17
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.telephony.Rlog; 


import java.util.Arrays;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.Executor;



/**
@@ -152,16 +153,9 @@ public final class TelephonyScanManager { 
                    throw new RuntimeException(

                        "Failed to find NetworkScanInfo with id " + message.arg2);

                }

                NetworkScanCallback callback = nsi.mCallback;

                Executor executor = nsi.mExecutor;

                if (callback == null) {

                    throw new RuntimeException(

                        "Failed to find NetworkScanCallback with id " + message.arg2);

                }

                if (executor == null) {

                    throw new RuntimeException(

                        "Failed to find Executor with id " + message.arg2);

                }



                final NetworkScanCallback callback = nsi.mCallback;

                final Executor executor = nsi.mExecutor;



                switch (message.what) {

                    case CALLBACK_RESTRICTED_SCAN_RESULTS:
@@ -246,9 +240,17 @@ public final class TelephonyScanManager { 
            NetworkScanRequest request, Executor executor, NetworkScanCallback callback,

            String callingPackage, @Nullable String callingFeatureId) {

        try {

            Objects.requireNonNull(request, "Request was null");

            Objects.requireNonNull(callback, "Callback was null");

            Objects.requireNonNull(executor, "Executor was null");

            final ITelephony telephony = getITelephony();

            if (telephony == null) return null;



            // The lock must be taken before calling requestNetworkScan because the resulting

            // scanId can be invoked asynchronously on another thread at any time after

            // requestNetworkScan invoked, leaving a critical section between that call and adding

            // the record to the ScanInfo cache.

            synchronized (mScanInfo) {

                int scanId = telephony.requestNetworkScan(

                        subId, request, mMessenger, new Binder(), callingPackage,

                        callingFeatureId);
@@ -256,7 +258,6 @@ public final class TelephonyScanManager { 
                    Rlog.e(TAG, "Failed to initiate network scan");

                    return null;

                }

            synchronized (mScanInfo) {

                // We link to death whenever a scan is started to ensure that we are linked

                // at the point that phone process death might matter.

                // We never unlink because: