diff options
| -rw-r--r-- | api/current.txt | 86 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 9 |
2 files changed, 89 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 51a8de925e33..ecef765e3f52 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31423,6 +31423,7 @@ package java.lang { method public static int getType(char); method public static int getType(int); method public static char highSurrogate(int); + method public static boolean isAlphabetic(int); method public static boolean isBmpCodePoint(int); method public static boolean isDefined(char); method public static boolean isDefined(int); @@ -31433,6 +31434,7 @@ package java.lang { method public static boolean isISOControl(int); method public static boolean isIdentifierIgnorable(char); method public static boolean isIdentifierIgnorable(int); + method public static boolean isIdeographic(int); method public static boolean isJavaIdentifierPart(char); method public static boolean isJavaIdentifierPart(int); method public static boolean isJavaIdentifierStart(char); @@ -31559,48 +31561,84 @@ package java.lang { method public static java.lang.Character.UnicodeBlock of(char); method public static java.lang.Character.UnicodeBlock of(int); field public static final java.lang.Character.UnicodeBlock AEGEAN_NUMBERS; + field public static final java.lang.Character.UnicodeBlock ALCHEMICAL_SYMBOLS; field public static final java.lang.Character.UnicodeBlock ALPHABETIC_PRESENTATION_FORMS; + field public static final java.lang.Character.UnicodeBlock ANCIENT_GREEK_MUSICAL_NOTATION; + field public static final java.lang.Character.UnicodeBlock ANCIENT_GREEK_NUMBERS; + field public static final java.lang.Character.UnicodeBlock ANCIENT_SYMBOLS; field public static final java.lang.Character.UnicodeBlock ARABIC; field public static final java.lang.Character.UnicodeBlock ARABIC_PRESENTATION_FORMS_A; field public static final java.lang.Character.UnicodeBlock ARABIC_PRESENTATION_FORMS_B; + field public static final java.lang.Character.UnicodeBlock ARABIC_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock ARMENIAN; field public static final java.lang.Character.UnicodeBlock ARROWS; + field public static final java.lang.Character.UnicodeBlock AVESTAN; + field public static final java.lang.Character.UnicodeBlock BALINESE; + field public static final java.lang.Character.UnicodeBlock BAMUM; + field public static final java.lang.Character.UnicodeBlock BAMUM_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock BASIC_LATIN; + field public static final java.lang.Character.UnicodeBlock BATAK; field public static final java.lang.Character.UnicodeBlock BENGALI; field public static final java.lang.Character.UnicodeBlock BLOCK_ELEMENTS; field public static final java.lang.Character.UnicodeBlock BOPOMOFO; field public static final java.lang.Character.UnicodeBlock BOPOMOFO_EXTENDED; field public static final java.lang.Character.UnicodeBlock BOX_DRAWING; + field public static final java.lang.Character.UnicodeBlock BRAHMI; field public static final java.lang.Character.UnicodeBlock BRAILLE_PATTERNS; + field public static final java.lang.Character.UnicodeBlock BUGINESE; field public static final java.lang.Character.UnicodeBlock BUHID; field public static final java.lang.Character.UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS; + field public static final java.lang.Character.UnicodeBlock CARIAN; + field public static final java.lang.Character.UnicodeBlock CHAM; field public static final java.lang.Character.UnicodeBlock CHEROKEE; field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY; field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY_FORMS; field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS; field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock CJK_RADICALS_SUPPLEMENT; + field public static final java.lang.Character.UnicodeBlock CJK_STROKES; field public static final java.lang.Character.UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION; field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS; field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A; field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B; + field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C; + field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D; field public static final java.lang.Character.UnicodeBlock COMBINING_DIACRITICAL_MARKS; + field public static final java.lang.Character.UnicodeBlock COMBINING_DIACRITICAL_MARKS_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock COMBINING_HALF_MARKS; field public static final java.lang.Character.UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS; + field public static final java.lang.Character.UnicodeBlock COMMON_INDIC_NUMBER_FORMS; field public static final java.lang.Character.UnicodeBlock CONTROL_PICTURES; + field public static final java.lang.Character.UnicodeBlock COPTIC; + field public static final java.lang.Character.UnicodeBlock COUNTING_ROD_NUMERALS; + field public static final java.lang.Character.UnicodeBlock CUNEIFORM; + field public static final java.lang.Character.UnicodeBlock CUNEIFORM_NUMBERS_AND_PUNCTUATION; field public static final java.lang.Character.UnicodeBlock CURRENCY_SYMBOLS; field public static final java.lang.Character.UnicodeBlock CYPRIOT_SYLLABARY; field public static final java.lang.Character.UnicodeBlock CYRILLIC; + field public static final java.lang.Character.UnicodeBlock CYRILLIC_EXTENDED_A; + field public static final java.lang.Character.UnicodeBlock CYRILLIC_EXTENDED_B; field public static final java.lang.Character.UnicodeBlock CYRILLIC_SUPPLEMENTARY; field public static final java.lang.Character.UnicodeBlock DESERET; field public static final java.lang.Character.UnicodeBlock DEVANAGARI; + field public static final java.lang.Character.UnicodeBlock DEVANAGARI_EXTENDED; field public static final java.lang.Character.UnicodeBlock DINGBATS; + field public static final java.lang.Character.UnicodeBlock DOMINO_TILES; + field public static final java.lang.Character.UnicodeBlock EGYPTIAN_HIEROGLYPHS; + field public static final java.lang.Character.UnicodeBlock EMOTICONS; field public static final java.lang.Character.UnicodeBlock ENCLOSED_ALPHANUMERICS; + field public static final java.lang.Character.UnicodeBlock ENCLOSED_ALPHANUMERIC_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS; + field public static final java.lang.Character.UnicodeBlock ENCLOSED_IDEOGRAPHIC_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock ETHIOPIC; + field public static final java.lang.Character.UnicodeBlock ETHIOPIC_EXTENDED; + field public static final java.lang.Character.UnicodeBlock ETHIOPIC_EXTENDED_A; + field public static final java.lang.Character.UnicodeBlock ETHIOPIC_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock GENERAL_PUNCTUATION; field public static final java.lang.Character.UnicodeBlock GEOMETRIC_SHAPES; field public static final java.lang.Character.UnicodeBlock GEORGIAN; + field public static final java.lang.Character.UnicodeBlock GEORGIAN_SUPPLEMENT; + field public static final java.lang.Character.UnicodeBlock GLAGOLITIC; field public static final java.lang.Character.UnicodeBlock GOTHIC; field public static final java.lang.Character.UnicodeBlock GREEK; field public static final java.lang.Character.UnicodeBlock GREEK_EXTENDED; @@ -31609,6 +31647,8 @@ package java.lang { field public static final java.lang.Character.UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS; field public static final java.lang.Character.UnicodeBlock HANGUL_COMPATIBILITY_JAMO; field public static final java.lang.Character.UnicodeBlock HANGUL_JAMO; + field public static final java.lang.Character.UnicodeBlock HANGUL_JAMO_EXTENDED_A; + field public static final java.lang.Character.UnicodeBlock HANGUL_JAMO_EXTENDED_B; field public static final java.lang.Character.UnicodeBlock HANGUL_SYLLABLES; field public static final java.lang.Character.UnicodeBlock HANUNOO; field public static final java.lang.Character.UnicodeBlock HEBREW; @@ -31616,12 +31656,20 @@ package java.lang { field public static final java.lang.Character.UnicodeBlock HIGH_SURROGATES; field public static final java.lang.Character.UnicodeBlock HIRAGANA; field public static final java.lang.Character.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS; + field public static final java.lang.Character.UnicodeBlock IMPERIAL_ARAMAIC; + field public static final java.lang.Character.UnicodeBlock INSCRIPTIONAL_PAHLAVI; + field public static final java.lang.Character.UnicodeBlock INSCRIPTIONAL_PARTHIAN; field public static final java.lang.Character.UnicodeBlock IPA_EXTENSIONS; + field public static final java.lang.Character.UnicodeBlock JAVANESE; + field public static final java.lang.Character.UnicodeBlock KAITHI; + field public static final java.lang.Character.UnicodeBlock KANA_SUPPLEMENT; field public static final java.lang.Character.UnicodeBlock KANBUN; field public static final java.lang.Character.UnicodeBlock KANGXI_RADICALS; field public static final java.lang.Character.UnicodeBlock KANNADA; field public static final java.lang.Character.UnicodeBlock KATAKANA; field public static final java.lang.Character.UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS; + field public static final java.lang.Character.UnicodeBlock KAYAH_LI; + field public static final java.lang.Character.UnicodeBlock KHAROSHTHI; field public static final java.lang.Character.UnicodeBlock KHMER; field public static final java.lang.Character.UnicodeBlock KHMER_SYMBOLS; field public static final java.lang.Character.UnicodeBlock LAO; @@ -31629,58 +31677,96 @@ package java.lang { field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_A; field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_ADDITIONAL; field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_B; + field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_C; + field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_D; + field public static final java.lang.Character.UnicodeBlock LEPCHA; field public static final java.lang.Character.UnicodeBlock LETTERLIKE_SYMBOLS; field public static final java.lang.Character.UnicodeBlock LIMBU; field public static final java.lang.Character.UnicodeBlock LINEAR_B_IDEOGRAMS; field public static final java.lang.Character.UnicodeBlock LINEAR_B_SYLLABARY; + field public static final java.lang.Character.UnicodeBlock LISU; field public static final java.lang.Character.UnicodeBlock LOW_SURROGATES; + field public static final java.lang.Character.UnicodeBlock LYCIAN; + field public static final java.lang.Character.UnicodeBlock LYDIAN; + field public static final java.lang.Character.UnicodeBlock MAHJONG_TILES; field public static final java.lang.Character.UnicodeBlock MALAYALAM; + field public static final java.lang.Character.UnicodeBlock MANDAIC; field public static final java.lang.Character.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS; field public static final java.lang.Character.UnicodeBlock MATHEMATICAL_OPERATORS; + field public static final java.lang.Character.UnicodeBlock MEETEI_MAYEK; field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A; field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B; field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS; field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS; + field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS; field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_TECHNICAL; + field public static final java.lang.Character.UnicodeBlock MODIFIER_TONE_LETTERS; field public static final java.lang.Character.UnicodeBlock MONGOLIAN; field public static final java.lang.Character.UnicodeBlock MUSICAL_SYMBOLS; field public static final java.lang.Character.UnicodeBlock MYANMAR; + field public static final java.lang.Character.UnicodeBlock MYANMAR_EXTENDED_A; + field public static final java.lang.Character.UnicodeBlock NEW_TAI_LUE; + field public static final java.lang.Character.UnicodeBlock NKO; field public static final java.lang.Character.UnicodeBlock NUMBER_FORMS; field public static final java.lang.Character.UnicodeBlock OGHAM; field public static final java.lang.Character.UnicodeBlock OLD_ITALIC; + field public static final java.lang.Character.UnicodeBlock OLD_PERSIAN; + field public static final java.lang.Character.UnicodeBlock OLD_SOUTH_ARABIAN; + field public static final java.lang.Character.UnicodeBlock OLD_TURKIC; + field public static final java.lang.Character.UnicodeBlock OL_CHIKI; field public static final java.lang.Character.UnicodeBlock OPTICAL_CHARACTER_RECOGNITION; field public static final java.lang.Character.UnicodeBlock ORIYA; field public static final java.lang.Character.UnicodeBlock OSMANYA; + field public static final java.lang.Character.UnicodeBlock PHAGS_PA; + field public static final java.lang.Character.UnicodeBlock PHAISTOS_DISC; + field public static final java.lang.Character.UnicodeBlock PHOENICIAN; field public static final java.lang.Character.UnicodeBlock PHONETIC_EXTENSIONS; + field public static final java.lang.Character.UnicodeBlock PHONETIC_EXTENSIONS_SUPPLEMENT; + field public static final java.lang.Character.UnicodeBlock PLAYING_CARDS; field public static final java.lang.Character.UnicodeBlock PRIVATE_USE_AREA; + field public static final java.lang.Character.UnicodeBlock REJANG; + field public static final java.lang.Character.UnicodeBlock RUMI_NUMERAL_SYMBOLS; field public static final java.lang.Character.UnicodeBlock RUNIC; + field public static final java.lang.Character.UnicodeBlock SAMARITAN; + field public static final java.lang.Character.UnicodeBlock SAURASHTRA; field public static final java.lang.Character.UnicodeBlock SHAVIAN; field public static final java.lang.Character.UnicodeBlock SINHALA; field public static final java.lang.Character.UnicodeBlock SMALL_FORM_VARIANTS; field public static final java.lang.Character.UnicodeBlock SPACING_MODIFIER_LETTERS; field public static final java.lang.Character.UnicodeBlock SPECIALS; + field public static final java.lang.Character.UnicodeBlock SUNDANESE; field public static final java.lang.Character.UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS; field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_ARROWS_A; field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_ARROWS_B; field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS; + field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_PUNCTUATION; field public static final java.lang.Character.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A; field public static final java.lang.Character.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B; field public static final deprecated java.lang.Character.UnicodeBlock SURROGATES_AREA; + field public static final java.lang.Character.UnicodeBlock SYLOTI_NAGRI; field public static final java.lang.Character.UnicodeBlock SYRIAC; field public static final java.lang.Character.UnicodeBlock TAGALOG; field public static final java.lang.Character.UnicodeBlock TAGBANWA; field public static final java.lang.Character.UnicodeBlock TAGS; field public static final java.lang.Character.UnicodeBlock TAI_LE; + field public static final java.lang.Character.UnicodeBlock TAI_THAM; + field public static final java.lang.Character.UnicodeBlock TAI_VIET; field public static final java.lang.Character.UnicodeBlock TAI_XUAN_JING_SYMBOLS; field public static final java.lang.Character.UnicodeBlock TAMIL; field public static final java.lang.Character.UnicodeBlock TELUGU; field public static final java.lang.Character.UnicodeBlock THAANA; field public static final java.lang.Character.UnicodeBlock THAI; field public static final java.lang.Character.UnicodeBlock TIBETAN; + field public static final java.lang.Character.UnicodeBlock TIFINAGH; + field public static final java.lang.Character.UnicodeBlock TRANSPORT_AND_MAP_SYMBOLS; field public static final java.lang.Character.UnicodeBlock UGARITIC; field public static final java.lang.Character.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS; + field public static final java.lang.Character.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED; + field public static final java.lang.Character.UnicodeBlock VAI; field public static final java.lang.Character.UnicodeBlock VARIATION_SELECTORS; field public static final java.lang.Character.UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT; + field public static final java.lang.Character.UnicodeBlock VEDIC_EXTENSIONS; + field public static final java.lang.Character.UnicodeBlock VERTICAL_FORMS; field public static final java.lang.Character.UnicodeBlock YIJING_HEXAGRAM_SYMBOLS; field public static final java.lang.Character.UnicodeBlock YI_RADICALS; field public static final java.lang.Character.UnicodeBlock YI_SYLLABLES; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index f92bba029f9c..fbc90e45fdb1 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2225,14 +2225,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { // Set default cdma call auto retry loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0); - // Set the preferred network mode to 0 = Global, CDMA default + // Set the preferred network mode to target desired value or Default + // value defined in RILConstants int type; - if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) { - type = Phone.NT_MODE_GLOBAL; - } else { - type = SystemProperties.getInt("ro.telephony.default_network", + type = SystemProperties.getInt("ro.telephony.default_network", RILConstants.PREFERRED_NETWORK_MODE); - } loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type); // --- New global settings start here |