drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,478 Commits 1 Branch 0 Tags
Commit Graph

2634 Commits

Author SHA1 Message Date
Amit Mahajan
07018456d9 am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev 
* commit '1fa77bb56b47049ab90fb3b1b81f1588896bc87c':
  change the property name about IDP from 'telephony.' to 'gsm.'
 2014-09-08 23:54:31 +00:00
Wink Saville
96b3e61ff6 Change getCurrentPhoneType to SystemApi 
Bug: 17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
 2014-09-08 16:52:03 -07:00
Steven Liu
db960ad188 change the property name about IDP from 'telephony.' to 'gsm.' 
'telphony.' couldn't be set successfully.

Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9
 2014-09-08 16:47:15 -07:00
Derek Tan
2bae510cce Update the comment in two APIs since we will persist the settings. 
Bug: 17255752
Change-Id: I28926381e8e982579b38c19799078f7a3151aefe
 2014-09-08 10:55:29 -07:00
Junda Liu
077ffae681 am 8e250c57: Merge "Hide APIs for simplified network settings." into lmp-dev 
* commit '8e250c572a6d56ba6b3645faa5b32edf1e795442':
  Hide APIs for simplified network settings.
 2014-09-06 02:58:04 +00:00
Junda Liu
c6bd32e94f Merge "Hide APIs for simplified network settings." into lmp-dev 2014-09-06 00:55:30 +00:00
Derek Tan
79b0cbb799 am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev 
* commit 'de6fefb4f5e9da6aedc600abd7c10d14398b47c7':
  Update the preferred network type APIs.
 2014-09-06 00:18:28 +00:00
Derek Tan
54e883bedc Update the preferred network type APIs. 
Bug: 17255752
Change-Id: I8f74749752f8d8c6cd5b28dd5fe4ed89a33481ed
 2014-09-05 17:06:46 -07:00
Derek Tan
22a3cf8349 am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev 
* commit '6f25963ebc8f91638b056107a7b7bdb6e182102f':
  Remove setCdmaSubscription API.
 2014-09-06 00:02:58 +00:00
Derek Tan
0bee5f5208 am d16f633f: Merge "Update the comment in sendEnvelope." into lmp-dev 
* commit 'd16f633fc9c949af155b3dff5f6f2d98c50a7c80':
  Update the comment in sendEnvelope.
 2014-09-05 23:58:16 +00:00
Shishir Agrawal
c4799b6bdc am 32148644: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 
* commit '321486444e6c4d7ee77f8981e9921b923308ced9':
  API change: SetOperatorBrandOverride should not take iccId as a param.
 2014-09-05 23:58:13 +00:00
Derek Tan
b5928445d1 Merge "Remove setCdmaSubscription API." into lmp-dev 2014-09-05 23:53:55 +00:00
Derek Tan
a0729d3487 Merge "Update the comment in sendEnvelope." into lmp-dev 2014-09-05 23:53:10 +00:00
Xia Ying
77ea3ee5ec Assisted dialing support of MO SMS 
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
 2014-09-05 16:52:56 -07:00
Shishir Agrawal
1244333998 Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 2014-09-05 23:51:40 +00:00
Junda Liu
b8025f3260 Hide APIs for simplified network settings. 
Bug: b/17255752
Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734
 2014-09-05 16:46:38 -07:00
Vineeta Srivastava
e30eeb5f56 am a8ceba1c: Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev 
* commit 'a8ceba1cb610c2ce166d4cdcbdb6eaec08886aa9':
  Plus code handling  for non-NANP CDMA carrier
 2014-09-05 23:03:22 +00:00
Shishir Agrawal
d2cfa92146 API change: SetOperatorBrandOverride should not take iccId as a param. 
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
 2014-09-05 15:37:44 -07:00
Steven Liu
9b656ee320 Plus code handling for non-NANP CDMA carrier 
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
 2014-09-05 22:13:11 +00:00
Derek Tan
1eda68766b Update the comment in sendEnvelope. 
Bug: 17255752
Change-Id: I4b56447e28bc9838b9ae0425a3673891647116d1
 2014-09-05 14:56:32 -07:00
Derek Tan
274baa73c5 Remove setCdmaSubscription API. 
Bug: 17255752
Change-Id: I0adc5c3d1b690d86f538c084d17d239f7ffccfca
 2014-09-05 14:48:11 -07:00
Amit Mahajan
5e615d8e6b am d494e6cb: Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev 
* commit 'd494e6cb1e61da0250261b7cdb76dd791c0c9571':
  Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu
 2014-09-05 19:31:58 +00:00
Amit Mahajan
f11b43d8bf Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev 2014-09-05 19:25:36 +00:00
Shishir Agrawal
d1d5b97bc0 am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev 
* commit 'e90b1315a83fd75906fa1bc876fb2973cf6f8676':
  IccOpenLogicalChannelResponse: Adding final to fa few constants.
 2014-09-05 15:30:56 +00:00
Shishir Agrawal
949bb79f70 Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev 2014-09-05 14:48:20 +00:00
Wink Saville
eb805eb767 am a829f8e2: Merge "More cleanup prior to unhiding" into lmp-dev 
* commit 'a829f8e2462157c16f60a52edd39b3c49209ab76':
  More cleanup prior to unhiding
 2014-09-05 03:50:42 +00:00
Wink Saville
3e0c8d3d3c Merge "More cleanup prior to unhiding" into lmp-dev 2014-09-05 03:40:19 +00:00
Wink Saville
905bb54108 More cleanup prior to unhiding 
Adding comments and rename publci SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
 2014-09-04 17:10:23 -07:00
Ye Wen
fbce7b598a am 3442921f: Merge "MMS API cleanup (1/4)" into lmp-dev 
* commit '3442921f2cbf42147df917618854b85f0a1f7a75':
  MMS API cleanup (1/4)
 2014-09-04 23:45:36 +00:00
Shishir Agrawal
ed62dd4e7f IccOpenLogicalChannelResponse: Adding final to fa few constants. 
Bug: 17390620 
Change-Id: I81d02b5b0d6e353a04d46663baad1b90398f5b36
 2014-09-04 23:15:27 +00:00
Ye Wen
8179c2a6e4 MMS API cleanup (1/4) 
- 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
 2014-09-04 15:41:56 -07:00
Tom Taylor
719126b87c am d1006b0f: Merge "Add mcc/mnc to SubInfoRecord" into lmp-dev 
* commit 'd1006b0f0372e068eac20c5c48f825a087577bae':
  Add mcc/mnc to SubInfoRecord
 2014-09-04 21:37:18 +00:00
Tom Taylor
7a96207e2b Add mcc/mnc to SubInfoRecord 
Bug 17157686

Change-Id: I47d19dea73f038a8d748f95dd33452da62ebf26b
 2014-09-04 14:05:20 -07:00
Nancy Chen
c7880d3f98 am c27868a6: Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 
* commit 'c27868a6d085f10f6ca4f4a83c382078648f21e7':
  Remove check for voicemail number when parsing URI phone number.
 2014-09-04 19:29:51 +00:00
Nancy Chen
81a0cbcda3 Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 2014-09-04 19:21:30 +00:00
Xia Ying
9bd196bb42 Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu 
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
 2014-09-04 12:05:53 -07:00
Wink Saville
a9e0662487 am bfa06279: Merge "Cleanup ISub.aidl" into lmp-dev 
* commit 'bfa06279cc8240015bd10b8be2748838122c7d11':
  Cleanup ISub.aidl
 2014-09-04 16:21:29 +00:00
Wink Saville
8fec2e4414 Cleanup ISub.aidl 
Fix copyright and remove @param context

Change-Id: Icf0a7899070f03161db54aac4a83f6dd060bc28d
 2014-09-03 20:42:37 -07:00
Wink Saville
34f1382d69 am f8773dfb: Merge "Add PhoneStateListener(Looper looper) and some documentation." into lmp-dev 
* commit 'f8773dfbbc84b52f308f61d75ae2a028773dc749':
  Add PhoneStateListener(Looper looper) and some documentation.
 2014-09-04 00:49:49 +00:00
Wink Saville
343feb7019 Merge commit '3432c20c' into fix-merge-conflict 
* commit '3432c20c':
  Hide SubscriptionManager using individual @hide on fields and methods.

Conflicts:
	telephony/java/android/telephony/SubscriptionManager.java

Change-Id: Ic8d528b7a046f0b2a9735ba62720de142952d7ef
 2014-09-03 17:38:28 -07:00
Wink Saville
cf39f86b50 Merge "Add PhoneStateListener(Looper looper) and some documentation." into lmp-dev 2014-09-03 23:37:17 +00:00
Julian Odell
ae4fd7b6a8 am 45ae7fb1: Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 
* commit '45ae7fb1d9981f9b17871c30e210db2a10d19075':
  Bug 17262099: MMS API changes (multi-project).
 2014-09-03 23:22:51 +00:00
Wink Saville
aea3bf798a am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev 
* commit '3c95cae1ab33a0fd3bd93422e91a8182bf49d017':
  Rename getActivatedXxx to getActiveXxx
 2014-09-03 23:22:36 +00:00
Wink Saville
2e40ba9dca Add PhoneStateListener(Looper looper) and some documentation. 
Bug: 17374935
Change-Id: I1eeb77fd7478cb81cde92f43a26ed19697323e6a
 2014-09-03 15:44:02 -07:00
Wink Saville
f5bca080a2 Hide SubscriptionManager using individual @hide on fields and methods. 
Doing this so the unhide for API Council will just be unhiding a few
fields/methods.

Change-Id: Iebc995c1aebe1f17a6552c28f771be7584bf0acb
 2014-09-03 15:41:36 -07:00
Stuart Scott
8d50c2029e resolved conflicts for merge of dadcc85e to lmp-sprout-dev 
Change-Id: Ib457b076a94ef51e63fce3e9a5ad49a56495b830
 2014-09-03 15:35:13 -07:00
Julian Odell
6c25708eb5 Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 2014-09-03 20:20:34 +00:00
Julian Odell
31ef14d4f0 Bug 17262099: MMS API changes (multi-project). 
Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.

Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
 2014-09-03 13:11:56 -07:00
Wink Saville
8a38a203a9 Rename getActivatedXxx to getActiveXxx 
Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
 2014-09-03 12:22:54 -07:00
Nancy Chen
fe99099ea7 Remove check for voicemail number when parsing URI phone number. 
Getting the voicemail number will be done in Telephony instead of in
PhoneNumberUtils which is called by Telecomm.

Bug: 17317190
Change-Id: Ia88a56516b4f57ac62dc5696ae359fd042fec040
 2014-09-03 11:05:31 -07:00