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

Commit 4a73b5f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" am: 2a5efce2 

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

Change-Id: I2d7de93b6ab55335c44a1073020834a0c8342fb9
parents aebcb988 2a5efce2

core/java/com/android/internal/telephony/ITelephonyRegistry.aidl

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ interface ITelephonyRegistry { 
    void notifyDataConnectionForSubscriber(

            int phoneId, int subId, in PreciseDataConnectionState preciseState);

    // Uses CellIdentity which is Parcelable here; will convert to CellLocation in client.

    void notifyCellLocation(in CellIdentity cellLocation);

    void notifyCellLocationForSubscriber(in int subId, in CellIdentity cellLocation);

    @UnsupportedAppUsage

    void notifyCellInfo(in List<CellInfo> cellInfo);

services/core/java/com/android/server/TelephonyRegistry.java

+17 −12
Original line number Diff line number Diff line
@@ -402,10 +402,15 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            switch (msg.what) {

                case MSG_USER_SWITCHED: {

                    if (VDBG) log("MSG_USER_SWITCHED userId=" + msg.arg1);

                    int numPhones = getTelephonyManager().getPhoneCount();

                    for (int sub = 0; sub < numPhones; sub++) {

                        TelephonyRegistry.this.notifyCellLocationForSubscriber(sub,

                                mCellIdentity[sub]);

                    int numPhones = getTelephonyManager().getActiveModemCount();

                    for (int phoneId = 0; phoneId < numPhones; phoneId++) {

                        int[] subIds = SubscriptionManager.getSubId(phoneId);

                        int subId =

                                (subIds != null) && (subIds.length > 0)

                                        ? subIds[0]

                                        : SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;

                        TelephonyRegistry.this.notifyCellLocationForSubscriber(

                                subId, mCellIdentity[phoneId], true /* hasUserSwitched */);

                    }

                    break;

                }
@@ -1879,20 +1884,20 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    }



    @Override

    public void notifyCellLocation(CellIdentity cellLocation) {

        notifyCellLocationForSubscriber(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, cellLocation);

    public void notifyCellLocationForSubscriber(int subId, CellIdentity cellIdentity) {

        notifyCellLocationForSubscriber(subId, cellIdentity, false /* hasUserSwitched */);

    }



    @Override

    public void notifyCellLocationForSubscriber(int subId, CellIdentity cellIdentity) {

        log("notifyCellLocationForSubscriber: subId=" + subId

                + " cellIdentity=" + cellIdentity);

    private void notifyCellLocationForSubscriber(int subId, CellIdentity cellIdentity,

            boolean hasUserSwitched) {

        log("notifyCellLocationForSubscriber: subId=" + subId + " cellIdentity=" + cellIdentity);

        if (!checkNotifyPermission("notifyCellLocation()")) {

            return;

        }

        int phoneId = getPhoneIdFromSubId(subId);

        synchronized (mRecords) {

            if (validatePhoneId(phoneId) && !Objects.equals(cellIdentity, mCellIdentity[phoneId])) {

            if (validatePhoneId(phoneId)

                    && (hasUserSwitched || !Objects.equals(cellIdentity, mCellIdentity[phoneId]))) {

                mCellIdentity[phoneId] = cellIdentity;

                for (Record r : mRecords) {

                    if (validateEventAndUserLocked(
@@ -2553,7 +2558,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            final int recordCount = mRecords.size();

            pw.println("last known state:");

            pw.increaseIndent();

            for (int i = 0; i < getTelephonyManager().getPhoneCount(); i++) {

            for (int i = 0; i < getTelephonyManager().getActiveModemCount(); i++) {

                pw.println("Phone Id=" + i);

                pw.increaseIndent();

                pw.println("mCallState=" + mCallState[i]);