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

Commit 269ee0aa authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Resolve possible race condition in CellularNetworkService 

There might be a race condition that before callback is stored
in mCallbackMap, complete message is back from mCi. Thus callback
is not retrived correctly when handling that message. This change
fixes that bug.

Bug: 73006796
Test: unit-test
Change-Id: I378928938f47b9ed9f9a6228db9931cc0a039171
parent b4a9738e

src/java/com/android/internal/telephony/CellularNetworkService.java

+5 −6
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ import android.telephony.Rlog; 
import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;



import java.util.HashMap;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;



/**

 * Implementation of network services for Cellular. It's a service that handles network requests
@@ -59,7 +58,8 @@ public class CellularNetworkService extends NetworkService { 


    private class CellularNetworkServiceProvider extends NetworkServiceProvider {



        private final Map<Message, NetworkServiceCallback> mCallbackMap = new HashMap<>();

        private final ConcurrentHashMap<Message, NetworkServiceCallback> mCallbackMap =

                new ConcurrentHashMap<>();



        private final Looper mLooper;
@@ -311,18 +311,17 @@ public class CellularNetworkService extends NetworkService { 


            if (domain == NetworkRegistrationState.DOMAIN_CS) {

                message = Message.obtain(mHandler, GET_CS_REGISTRATION_STATE_DONE);

                mCallbackMap.put(message, callback);

                mPhone.mCi.getVoiceRegistrationState(message);

            } else if (domain == NetworkRegistrationState.DOMAIN_PS) {

                message = Message.obtain(mHandler, GET_PS_REGISTRATION_STATE_DONE);

                mCallbackMap.put(message, callback);

                mPhone.mCi.getDataRegistrationState(message);

            } else {

                loge("getNetworkRegistrationState invalid domain " + domain);

                callback.onGetNetworkRegistrationStateComplete(

                        NetworkServiceCallback.RESULT_ERROR_INVALID_ARG, null);

                return;

            }



            mCallbackMap.put(message, callback);

        }



        @CallSuper