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

Commit d43a9ac5 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Rename CellInfo Functions for Clarity" 

am: 39951550

Change-Id: I58cb4e61710704d0a92d273ae4729bad9d5e8d03
parents 01c7dee3 39951550

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class LocaleTracker extends Handler { 
    public void handleMessage(Message msg) {

        switch (msg.what) {

            case EVENT_REQUEST_CELL_INFO:

                mPhone.getAllCellInfo(null, obtainMessage(EVENT_RESPONSE_CELL_INFO));

                mPhone.requestCellInfoUpdate(null, obtainMessage(EVENT_RESPONSE_CELL_INFO));

                break;



            case EVENT_UNSOL_CELL_INFO:

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

+1 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * @param workSource calling WorkSource

     * @param rspMsg the response message containing the cell info

     */

    public void getAllCellInfo(WorkSource workSource, Message rspMsg) {

    public void requestCellInfoUpdate(WorkSource workSource, Message rspMsg) {

        getServiceStateTracker().requestAllCellInfo(workSource, rspMsg);

    }

tests/telephonytests/src/com/android/internal/telephony/LocaleTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class LocaleTrackerTest extends TelephonyTest { 
            Message m = invocation.getArgument(1);

            AsyncResult.forMessage(m, Arrays.asList(mCellInfo), null);

            m.sendToTarget();

            return null; }).when(mPhone).getAllCellInfo(any(), any());

            return null; }).when(mPhone).requestCellInfoUpdate(any(), any());



        logd("LocaleTrackerTest -Setup!");

    }