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

Commit 98ad0988 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2... 

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

Merge commit 'b307c894'

* commit 'b307c894':
  Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
parents 1d359556 b307c894

telephony/java/android/telephony/TelephonyManager.java

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

     * No phone module

     *

     *

     */

     */

    public static final int PHONE_TYPE_NONE = 0;

    public static final int PHONE_TYPE_NONE = RILConstants.NO_PHONE;





    /**

    /**

     * GSM phone

     * GSM phone

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

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

    int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;

    int CDMA_CELL_BROADCAST_SMS_ENABLED  = 0;

    int CDMA_CELL_BROADCAST_SMS_ENABLED  = 0;





    int CDMA_PHONE = 0;

    int NO_PHONE = 0;

    int GSM_PHONE = 1;

    int GSM_PHONE = 1;

    int CDMA_PHONE = 2;





    int CDM_TTY_MODE_DISABLED = 0;

    int CDM_TTY_MODE_DISABLED = 0;

    int CDM_TTY_MODE_ENABLED = 1;

    int CDM_TTY_MODE_ENABLED = 1;