Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Fix build breakage

Browse Source 
Remove the lines in system-current.txt that were mistakenly added during
conflict resolution.

Bug: 119675160
Test: compiles
Change-Id: I414ccc755e70675261c35fcdc38b98d310bb8f91
This commit is contained in:
Hall Liu
2018-12-04 14:07:05 -08:00
parent 78128395e7
commit 634fd70147
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/system-current.txt
View File

@@ -5400,29 +5400,6 @@ package android.telephony {
field public static final java.lang.String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";
field public static final java.lang.String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";
field public static final long MAX_NUMBER_VERIFICATION_TIMEOUT_MILLIS = 60000L; // 0xea60L
field public static final int NETWORK_MODE_CDMA_EVDO = 4; // 0x4
field public static final int NETWORK_MODE_CDMA_NO_EVDO = 5; // 0x5
field public static final int NETWORK_MODE_EVDO_NO_CDMA = 6; // 0x6
field public static final int NETWORK_MODE_GLOBAL = 7; // 0x7
field public static final int NETWORK_MODE_GSM_ONLY = 1; // 0x1
field public static final int NETWORK_MODE_GSM_UMTS = 3; // 0x3
field public static final int NETWORK_MODE_LTE_CDMA_EVDO = 8; // 0x8
field public static final int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; // 0xa
field public static final int NETWORK_MODE_LTE_GSM_WCDMA = 9; // 0x9
field public static final int NETWORK_MODE_LTE_ONLY = 11; // 0xb
field public static final int NETWORK_MODE_LTE_TDSCDMA = 15; // 0xf
field public static final int NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 22; // 0x16
field public static final int NETWORK_MODE_LTE_TDSCDMA_GSM = 17; // 0x11
field public static final int NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA = 20; // 0x14
field public static final int NETWORK_MODE_LTE_TDSCDMA_WCDMA = 19; // 0x13
field public static final int NETWORK_MODE_LTE_WCDMA = 12; // 0xc
field public static final int NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 21; // 0x15
field public static final int NETWORK_MODE_TDSCDMA_GSM = 16; // 0x10
field public static final int NETWORK_MODE_TDSCDMA_GSM_WCDMA = 18; // 0x12
field public static final int NETWORK_MODE_TDSCDMA_ONLY = 13; // 0xd
field public static final int NETWORK_MODE_TDSCDMA_WCDMA = 14; // 0xe
field public static final int NETWORK_MODE_WCDMA_ONLY = 2; // 0x2
field public static final int NETWORK_MODE_WCDMA_PREF = 0; // 0x0
field public static final int NETWORK_TYPE_BITMASK_1xRTT = 128; // 0x80
field public static final int NETWORK_TYPE_BITMASK_CDMA = 16; // 0x10
field public static final int NETWORK_TYPE_BITMASK_EDGE = 4; // 0x4