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

Commit 6ec5ffe7 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Show signal strength of current active subscription 

For grouped primary and opportunistic use-case, if both are active,
mobile signal bar should by default show which one is currently
used for Internet data. Unless carrier set it otherwise -- if they
want to always show signal bar of primary subscription.

Bug: 123780907
Test: manual
Change-Id: I62e298e7b9bdc82dd44f0c8ae783c623e101b0ef
Merged-In: I62e298e7b9bdc82dd44f0c8ae783c623e101b0ef
parent aeb06221

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+43 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
package com.android.systemui.statusbar.policy;



import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;



import static com.android.internal.telephony.PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM;



import android.content.BroadcastReceiver;

import android.content.Context;
@@ -35,6 +38,7 @@ import android.os.Looper; 
import android.os.PersistableBundle;

import android.provider.Settings;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SubscriptionInfo;
@@ -96,6 +100,16 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    private final CurrentUserTracker mUserTracker;

    private Config mConfig;



    private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {

        @Override

        public void onActiveDataSubscriptionIdChanged(int subId) {

            mActiveMobileDataSubscription = subId;

            doUpdateMobileControllers();

        }

    };



    private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;



    // Subcontrollers.

    @VisibleForTesting

    final WifiSignalController mWifiSignalController;
@@ -269,6 +283,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            mSubscriptionListener = new SubListener();

        }

        mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener);

        mPhone.listen(mPhoneStateListener, LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE);



        // broadcasts

        IntentFilter filter = new IntentFilter();
@@ -513,6 +528,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 


    @VisibleForTesting

    void handleConfigurationChanged() {

        updateMobileControllers();

        for (int i = 0; i < mMobileSignalControllers.size(); i++) {

            MobileSignalController controller = mMobileSignalControllers.valueAt(i);

            controller.setConfiguration(mConfig);
@@ -527,13 +543,39 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        doUpdateMobileControllers();

    }



    private void filterMobileSubscriptionInSameGroup(List<SubscriptionInfo> subscriptions) {

        if (subscriptions.size() == MAX_PHONE_COUNT_DUAL_SIM) {

            SubscriptionInfo info1 = subscriptions.get(0);

            SubscriptionInfo info2 = subscriptions.get(1);

            if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {

                // If both subscriptions are primary, show both.

                if (!info1.isOpportunistic() && !info2.isOpportunistic()) return;



                // If carrier required, always show signal bar of primary subscription.

                // Otherwise, show whichever subscription is currently active for Internet.

                boolean alwaysShowPrimary = CarrierConfigManager.getDefaultConfig()

                        .getBoolean(CarrierConfigManager

                        .KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN);

                if (alwaysShowPrimary) {

                    subscriptions.remove(info1.isOpportunistic() ? info1 : info2);

                } else {

                    subscriptions.remove(info1.getSubscriptionId() == mActiveMobileDataSubscription

                            ? info2 : info1);

                }

            }

        }

    }



    @VisibleForTesting

    void doUpdateMobileControllers() {

        List<SubscriptionInfo> subscriptions = mSubscriptionManager

                .getActiveSubscriptionInfoList(true);

                .getActiveSubscriptionInfoList(false);

        if (subscriptions == null) {

            subscriptions = Collections.emptyList();

        }



        filterMobileSubscriptionInSameGroup(subscriptions);



        // If there have been no relevant changes to any of the subscriptions, we can leave as is.

        if (hasCorrectMobileControllers(subscriptions)) {

            // Even if the controllers are correct, make sure we have the right no sims state.

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0
Original line number Diff line number Diff line
@@ -2489,6 +2489,18 @@ public class CarrierConfigManager { 
    public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY =

            "emergency_number_prefix_string_array";



    /**

     * Indicates when a carrier has a primary subscription and an opportunistic subscription active,

     * and when Internet data is switched to opportunistic network, whether to still show

     * signal bar of primary network. By default it will be false, meaning whenever data

     * is going over opportunistic network, signal bar will reflect signal strength and rat

     * icon of that network.

     *

     * @hide

     */

    public static final String KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN =

            "always_show_primary_signal_bar_in_opportunistic_network_boolean";



    /**

     * Determines whether the carrier wants to cancel the cs reject notification automatically

     * when the voice registration state changes.
@@ -2925,6 +2937,8 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

                "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");

        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,

                false);

    }



    /**