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

Commit 7598f775 authored by Jack Nudelman's avatar Jack Nudelman Committed by Automerger Merge Worker
Browse files

Merge "Populate recently added sim_mccmnc into ActiveSubscriptionInfo." into... 

Merge "Populate recently added sim_mccmnc into ActiveSubscriptionInfo." into rvc-dev am: d5c796f7 am: 5f0fd50c am: f7768ade am: 2bcde4d3

Change-Id: Ia1c9e7dd35fe4fdb1eff13368c1f35a7dd39673d
parents f4c2aab6 2bcde4d3

proto/src/telephony.proto

+8 −0
Original line number Diff line number Diff line
@@ -1841,6 +1841,14 @@ message ActiveSubscriptionInfo { 


  /** whether subscription is opportunistic (0 - false, 1 - true, -1 - unknown). */

  optional int32 is_opportunistic = 3;



  /** The mccmnc associated with the subscription. Useful for differentiating

   * between subscriptions with different mccmnc but same carrier_id (eg. Fi

   * Sprint vs. Fi T-Mobile).*/

  optional string sim_mccmnc = 4 /*[

    (datapol.semantic_type) = ST_LOCATION,

    (datapol.location_qualifier) = { precise_location: false }

  ]*/;

};



enum SimState {

src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java

+3 −0
Original line number Diff line number Diff line
@@ -806,6 +806,9 @@ public class TelephonyMetrics { 
            activeSubscriptionInfo.slotIndex = phoneId;

            activeSubscriptionInfo.isOpportunistic = info.isOpportunistic() ? 1 : 0;

            activeSubscriptionInfo.carrierId = info.getCarrierId();

            if (info.getMccString() != null && info.getMncString() != null) {

                activeSubscriptionInfo.simMccmnc = info.getMccString() + info.getMncString();

            }

            if (!MessageNano.messageNanoEquals(

                    mLastActiveSubscriptionInfos.get(phoneId), activeSubscriptionInfo)) {

                addTelephonyEvent(new TelephonyEventBuilder(phoneId)