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

Commit ec807a6c authored by Sarah Kim's avatar Sarah Kim Committed by Android (Google) Code Review
Browse files

Merge "Support RRC idle for NR SA" into main

parents 03614c27 81419c19

flags/network.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -27,3 +27,10 @@ flag { 
  description: "Used in the Preferred Network Types menu to determine if the 3G option is displayed."

  bug: "310639009"

}



flag {

  name: "support_nr_sa_rrc_idle"

  namespace: "telephony"

  description: "Support RRC idle for NR SA."

  bug: "301467052"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class DisplayInfoController extends Handler { 
                TelephonyManager.NETWORK_TYPE_UNKNOWN,

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                false);

        mNetworkTypeController = new NetworkTypeController(phone, this);

        mNetworkTypeController = new NetworkTypeController(phone, this, featureFlags);

        // EVENT_UPDATE will transition from DefaultState to the current state

        // and update the TelephonyDisplayInfo based on the current state.

        mNetworkTypeController.sendMessage(NetworkTypeController.EVENT_UPDATE);

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

+200 −18

File changed.

Preview size limit exceeded, changes collapsed.

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

+254 −9

File changed.

Preview size limit exceeded, changes collapsed.