summaryrefslogtreecommitdiffstats
path: root/telephony/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle ↵Anthony Lee2014-09-121-3/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | negatives." into lmp-dev * commit '12c83b93b13a7e6d37b385c1270c29d8a959bc78': isValidSlotId() and isValidPhoneId() updated to handle negatives.
| * | isValidSlotId() and isValidPhoneId() updated to handle negatives.Anthony Lee2014-09-111-3/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The old version of the code wanted to just check to make sure that the slot/phone id is greater than INVALID_SLOT_ID or INVALID_PHONE_ID that are both currently defined to be -1000. The changes are made for 2 reasons. First, INVALID_SLOT_ID and/or INVALID_PHONE_ID might not always be defined to be a negative value so there is a big assumption. Secondly, anything greater than -1000 allows other negative values to be considered valid ids. Bug: 17243556 Change-Id: I2bbfcc2cfd2d7c4772dfb9c50af2dc88c0f315e2
* | am 4c8c7591: Merge "Update the comment in two APIs since we will persist the ↵Derek Tan2014-09-112-21/+24
|\ \ | |/ | | | | | | | | | | settings." into lmp-dev * commit '4c8c759106eba4070a46393f2978607964881511': Update the comment in two APIs since we will persist the settings.
| * Merge "Update the comment in two APIs since we will persist the settings." ↵Derek Tan2014-09-112-21/+24
| |\ | | | | | | | | | into lmp-dev
| | * Update the comment in two APIs since we will persist the settings.Derek Tan2014-09-082-21/+24
| | | | | | | | | | | | | | | Bug: 17255752 Change-Id: I28926381e8e982579b38c19799078f7a3151aefe
* | | Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.Wink Saville2014-09-091-1/+1
| | | | | | | | | | | | | | | Bug: 17255752 Change-Id: I0c792227105c6b4697b9de0e7120247795ab6641
* | | am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.Junda Liu2014-09-102-16/+17
|\ \ \ | |/ / | | | | | | | | | * commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8': Add ForSubscriber suffix to APIs w/ subId argument.
| * | Add ForSubscriber suffix to APIs w/ subId argument.Junda Liu2014-09-092-16/+17
| | | | | | | | | | | | | | | Bug: b/17255752 Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
* | | Unhide SubscriptionManager and SubInfoRecordWink Saville2014-09-092-16/+1
| | | | | | | | | | | | Change-Id: I1e6efb4442f0400d404d725c7db5020a26c00f98
* | | am 5dac65ad: Change suffix UsingSubId to ForSubscriber.Wink Saville2014-09-097-92/+92
|\ \ \ | |/ / | | | | | | | | | * commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82': Change suffix UsingSubId to ForSubscriber.
| * | Change suffix UsingSubId to ForSubscriber.Wink Saville2014-09-097-92/+92
| | | | | | | | | | | | | | | Bug: 17255752 Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
* | | am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-devWink Saville2014-09-091-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '26207b53a82f1e8f3d72eaf36bd69dbcb06833fc': Change getCurrentPhoneType to SystemApi
| * | Merge "Change getCurrentPhoneType to SystemApi" into lmp-devWink Saville2014-09-091-0/+2
| |\ \
| | * | Change getCurrentPhoneType to SystemApiWink Saville2014-09-081-0/+2
| | |/ | | | | | | | | | | | | Bug: 17394367 Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
* | | am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-devAmit Mahajan2014-09-091-1/+2
|\ \ \ | |/ / | | | | | | | | | * commit '034fe21c638960d8d67711f446c818b93e41641e': Assisted dialing support of MO SMS
| * | Merge "Assisted dialing support of MO SMS" into lmp-devAmit Mahajan2014-09-081-1/+2
| |\ \
| | * | Assisted dialing support of MO SMSXia Ying2014-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is special for VZW requirement. Follow the specificaitons of assisted dialing of MO SMS while traveling on VZW CDMA, international CDMA or GSM markets. Change-Id: I34a531b817095f4ce035f3f49a3bf7d6e2e8bc13
* | | | am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' ↵Amit Mahajan2014-09-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to \'gsm.\'" into lmp-dev * commit '1fa77bb56b47049ab90fb3b1b81f1588896bc87c': change the property name about IDP from 'telephony.' to 'gsm.'
| * | | change the property name about IDP from 'telephony.' to 'gsm.'Steven Liu2014-09-081-1/+1
| | |/ | |/| | | | | | | | | | | | | 'telphony.' couldn't be set successfully. Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9
* | | am 8e250c57: Merge "Hide APIs for simplified network settings." into lmp-devJunda Liu2014-09-061-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit '8e250c572a6d56ba6b3645faa5b32edf1e795442': Hide APIs for simplified network settings.
| * | Merge "Hide APIs for simplified network settings." into lmp-devJunda Liu2014-09-061-0/+4
| |\ \
| | * | Hide APIs for simplified network settings.Junda Liu2014-09-051-0/+4
| | | | | | | | | | | | | | | | | | | | Bug: b/17255752 Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734
* | | | am de6fefb4: Merge "Update the preferred network type APIs." into lmp-devDerek Tan2014-09-061-21/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'de6fefb4f5e9da6aedc600abd7c10d14398b47c7': Update the preferred network type APIs.
| * | | Update the preferred network type APIs.Derek Tan2014-09-051-21/+16
| | | | | | | | | | | | | | | | | | | | Bug: 17255752 Change-Id: I8f74749752f8d8c6cd5b28dd5fe4ed89a33481ed
* | | | am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-devDerek Tan2014-09-062-31/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6f25963ebc8f91638b056107a7b7bdb6e182102f': Remove setCdmaSubscription API.
| * | | Merge "Remove setCdmaSubscription API." into lmp-devDerek Tan2014-09-052-31/+0
| |\ \ \
| | * | | Remove setCdmaSubscription API.Derek Tan2014-09-052-31/+0
| | | |/ | | |/| | | | | | | | | | | | | Bug: 17255752 Change-Id: I0adc5c3d1b690d86f538c084d17d239f7ffccfca
* | | | am d16f633f: Merge "Update the comment in sendEnvelope." into lmp-devDerek Tan2014-09-051-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd16f633fc9c949af155b3dff5f6f2d98c50a7c80': Update the comment in sendEnvelope.
| * | | Merge "Update the comment in sendEnvelope." into lmp-devDerek Tan2014-09-051-3/+3
| |\ \ \
| | * | | Update the comment in sendEnvelope.Derek Tan2014-09-051-3/+3
| | |/ / | | | | | | | | | | | | | | | | Bug: 17255752 Change-Id: I4b56447e28bc9838b9ae0425a3673891647116d1
* | | | am 32148644: Merge "API change: SetOperatorBrandOverride should not take ↵Shishir Agrawal2014-09-052-10/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | iccId as a param." into lmp-dev * commit '321486444e6c4d7ee77f8981e9921b923308ced9': API change: SetOperatorBrandOverride should not take iccId as a param.
| * | | Merge "API change: SetOperatorBrandOverride should not take iccId as a ↵Shishir Agrawal2014-09-052-10/+7
| |\ \ \ | | | | | | | | | | | | | | | param." into lmp-dev
| | * | | API change: SetOperatorBrandOverride should not take iccId as a param.Shishir Agrawal2014-09-052-10/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taking ICCID as a parameter is not scure since a carrier can override the brand for other carriers. We should override only the current ICCID. Bug: 17390144 Change-Id: I9be2cb5c5fa15367fcb3b548b6e601a294e84dbc
* | | | am a8ceba1c: Merge "Plus code handling for non-NANP CDMA carrier" into lmp-devVineeta Srivastava2014-09-052-75/+74
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a8ceba1cb610c2ce166d4cdcbdb6eaec08886aa9': Plus code handling for non-NANP CDMA carrier
| * | | Plus code handling for non-NANP CDMA carrierSteven Liu2014-09-052-75/+74
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since most of CDMA network do not support phone number with "+" for international dialing, current AOSP support the "+" handling for NANP CDMA network, this part add the support for non-NANP CDMA Network, convert "+" to right IDD(International Direct Dialing) code. And adding a new property for current IDD. Bug: 17210134 Change-Id: I369083169bb3504f8de9774b65f3993dd561c525
* | | am d494e6cb: Merge "Fix the IndexOutOfBoundsException when unpacking GSM ↵Amit Mahajan2014-09-051-3/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | 8-bit pdu" into lmp-dev * commit 'd494e6cb1e61da0250261b7cdb76dd791c0c9571': Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu
| * | Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into ↵Amit Mahajan2014-09-051-3/+12
| |\ \ | | | | | | | | | | | | lmp-dev
| | * | Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pduXia Ying2014-09-041-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some wap push messages contains the charactors which are not in the GSM 7 bit Default Alphabet table and its extension table, it cause the IndexOutOfBoundsException when unpacking GSM 8-bit encoded pdu. Solution: Replace them with white space. Change-Id: I273953341cffddc2269332eabc556e303ff81bec
* | | | am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few ↵Shishir Agrawal2014-09-051-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | constants." into lmp-dev * commit 'e90b1315a83fd75906fa1bc876fb2973cf6f8676': IccOpenLogicalChannelResponse: Adding final to fa few constants.
| * | | Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." ↵Shishir Agrawal2014-09-051-5/+5
| |\ \ \ | | | | | | | | | | | | | | | into lmp-dev
| | * | | IccOpenLogicalChannelResponse: Adding final to fa few constants.Shishir Agrawal2014-09-041-5/+5
| | |/ / | | | | | | | | | | | | Bug: 17390620 Change-Id: I81d02b5b0d6e353a04d46663baad1b90398f5b36
* | | | am a829f8e2: Merge "More cleanup prior to unhiding" into lmp-devWink Saville2014-09-052-113/+202
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a829f8e2462157c16f60a52edd39b3c49209ab76': More cleanup prior to unhiding
| * | | Merge "More cleanup prior to unhiding" into lmp-devWink Saville2014-09-052-113/+202
| |\ \ \
| | * | | More cleanup prior to unhidingWink Saville2014-09-042-113/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding comments and rename publci SubInfoRecord instance variables Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
* | | | | am 3442921f: Merge "MMS API cleanup (1/4)" into lmp-devYe Wen2014-09-041-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3442921f2cbf42147df917618854b85f0a1f7a75': MMS API cleanup (1/4)
| * | | | MMS API cleanup (1/4)Ye Wen2014-09-041-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Hide APIs not approved by API council (b/17189780) - Change configOverrides in MMS APIs from ContentValues to Bundle to be consistent (b/17390017) - Change SmsManager.MMS_EXTRA_DATA to EXTRA_MMS_DATA per API council review (b/17390977) b/17189780 b/17390017 b/17390977 Change-Id: If5a43e9ab9e42b6328f1581b39051ddf1a58f0dd
* | | | am d1006b0f: Merge "Add mcc/mnc to SubInfoRecord" into lmp-devTom Taylor2014-09-042-16/+41
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd1006b0f0372e068eac20c5c48f825a087577bae': Add mcc/mnc to SubInfoRecord
| * | | Add mcc/mnc to SubInfoRecordTom Taylor2014-09-042-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | Bug 17157686 Change-Id: I47d19dea73f038a8d748f95dd33452da62ebf26b
* | | | am c27868a6: Merge "Remove check for voicemail number when parsing URI phone ↵Nancy Chen2014-09-041-8/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | number." into lmp-dev * commit 'c27868a6d085f10f6ca4f4a83c382078648f21e7': Remove check for voicemail number when parsing URI phone number.
| * | | Merge "Remove check for voicemail number when parsing URI phone number." ↵Nancy Chen2014-09-041-8/+0
| |\ \ \ | | |/ / | |/| | | | | | into lmp-dev