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

Commit af62adcb authored by Nathan Harold's avatar Nathan Harold
Browse files

Revert "Use the SubId in the TM.getNetworkType if Valid" 

This reverts commit f36fee3c.

Reason for revert: 133129040

Bug: 133129040
Merged-In: I9a974018d4155426b1050a4b80b82f4bf4a9d996
Change-Id: Ib6f9a4e461a7e1cfa6c4648bd289a8f92475423e
parent f36fee3c

telephony/java/android/telephony/TelephonyManager.java

+31 −3
Original line number Diff line number Diff line
@@ -2446,7 +2446,21 @@ public class TelephonyManager { 
     * @return the NETWORK_TYPE_xxxx for current data connection.

     */

    public @NetworkType int getNetworkType() {

        return getDataNetworkType();

       try {

           ITelephony telephony = getITelephony();

           if (telephony != null) {

               return telephony.getNetworkType();

            } else {

                // This can happen when the ITelephony interface is not up yet.

                return NETWORK_TYPE_UNKNOWN;

            }

        } catch(RemoteException ex) {

            // This shouldn't happen in the normal case

            return NETWORK_TYPE_UNKNOWN;

        } catch (NullPointerException ex) {

            // This could happen before phone restarts due to crashing

            return NETWORK_TYPE_UNKNOWN;

        }

    }



    /**
@@ -2477,9 +2491,23 @@ public class TelephonyManager { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public int getNetworkType(int subId) {

        return getDataNetworkType(subId);

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.getNetworkTypeForSubscriber(subId, getOpPackageName());

            } else {

                // This can happen when the ITelephony interface is not up yet.

                return NETWORK_TYPE_UNKNOWN;

            }

        } catch (RemoteException ex) {

            // This shouldn't happen in the normal case

            return NETWORK_TYPE_UNKNOWN;

        } catch (NullPointerException ex) {

            // This could happen before phone restarts due to crashing

            return NETWORK_TYPE_UNKNOWN;

        }

    }



    /**