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

Commit ae3fcd69 authored by Stuart Scott's avatar Stuart Scott Committed by Android (Google) Code Review
Browse files

Merge "Comment out masking of supported RAFs" into lmp-mr1-dev

parents e6992ac8 972efd34

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

+4 −3
Original line number Diff line number Diff line
@@ -268,9 +268,10 @@ public class ProxyController { 
                mSetRadioAccessFamilyStatus[phoneId] = SET_RC_STATUS_STARTING;

                mOldRadioAccessFamily[phoneId] = mProxyPhones[phoneId].getRadioAccessFamily();

                int requestedRaf = rafs[i].getRadioAccessFamily();

                int supportedRaf = mProxyPhones[i].getSupportedRadioAccessFamily();

                // Set the new radio access family to the maximum of the request and the supported

                mNewRadioAccessFamily[phoneId] = requestedRaf & supportedRaf;

                // TODO Set the new radio access family to the maximum of the requested & supported

                // int supportedRaf = mProxyPhones[i].getSupportedRadioAccessFamily();

                // mNewRadioAccessFamily[phoneId] = requestedRaf & supportedRaf;

                mNewRadioAccessFamily[phoneId] = requestedRaf;

                logd("setRadioCapability: mOldRadioAccessFamily[" + phoneId + "]="

                        + mOldRadioAccessFamily[phoneId]);

                logd("setRadioCapability: mNewRadioAccessFamily[" + phoneId + "]="