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

Commit 1c610438 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Merge commit 'bc4da97c' into... 

Merge commit 'bc4da97c' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
parents abc571c6 bc4da97c

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32825,7 +32825,7 @@ package android.telephony { 
    method public void notifyConfigChangedForSubId(int);

    method public void updateConfigForPhoneId(int, java.lang.String);

    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";

    field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";

    field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";

    field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";