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

Commit b307c894 authored by Wink Saville's avatar Wink Saville
Browse files

Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE. 

This bug originally reported that PHONE_TYPE_CDMA needed to be 2 because
it was public. But as far as I can tell it has never been public and it
is still marked @hide so is not public now. There is a bug in that
PHONE_TYPE_NONE and PHONE_TYPE_CDMA were both 0. But this doesn't
appear to have been a problem because PHONE_TYPE_NONE doesn't looked to be
used anywhere except in TelephonyManagerTest.
parent 0869f7ef

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class TelephonyManager { 
     * No phone module

     *

     */

    public static final int PHONE_TYPE_NONE = 0;

    public static final int PHONE_TYPE_NONE = RILConstants.NO_PHONE;



    /**

     * GSM phone

telephony/java/com/android/internal/telephony/RILConstants.java

+2 −1
Original line number Diff line number Diff line
@@ -68,8 +68,9 @@ public interface RILConstants { 
    int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;

    int CDMA_CELL_BROADCAST_SMS_ENABLED  = 0;



    int CDMA_PHONE = 0;

    int NO_PHONE = 0;

    int GSM_PHONE = 1;

    int CDMA_PHONE = 2;



    int CDM_TTY_MODE_DISABLED = 0;

    int CDM_TTY_MODE_ENABLED = 1;