Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,200 Commits 3 Branches 0 Tags
b42786f4911368800116e671dee54079d3bee29f
Commit Graph

208 Commits

Author SHA1 Message Date
Stuart Scott
015f3b464c Get the MCC/MNC using defaults. 
First try default data, then default sms, then default voice, finally
try the first sub to come up.

bug: 17396869
Change-Id: I09da19b7b25c2a6aa8affd95847dbb10e039f634
 2014-09-29 13:20:25 -07:00
Junda Liu
cb6b5f9bd1 am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '96c548791145ab33ceb0935f38323d3182d44419':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 17:46:39 +00:00
Junda Liu
bac6d61ab6 Hide CarrierPrivilege APIs in TelMgr. 
Per API council decision, we will polish and public in MR1.

Bug: b/17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
 2014-09-25 10:25:10 -07:00
Yorke Lee
ee743e6071 resolved conflicts for merge of f3804c3c to lmp-sprout-dev 
Conflicts:
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ibdd0b6c2c9901ec46196ac9460a0908dfb739ad4
 2014-09-14 13:58:59 -07:00
Yorke Lee
2ae312e306 Pipe TelephonyManager.getCallState through TelecommManager 
* Add TelecommManager.getCallState (hidden API)
* Make TelephonyManager.getCallState call through to
TelecommManager, to be consistent with
TelephonyManager.ACTION_PHONE_STATE_CHANGED broadcasts for
overall call state. Telephony continues to manage call states for
individual subscriptions.

Bug: 17378767
Change-Id: Ia5e8b21df801ed3af4f6e14c110a72c92f077f88
 2014-09-14 09:54:23 -07:00
Tyler Gunn
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev 
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
 2014-09-13 20:10:08 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Derek Tan
e7fc8602eb am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 
* commit '4c8c759106eba4070a46393f2978607964881511':
  Update the comment in two APIs since we will persist the settings.
 2014-09-11 16:00:55 +00:00
Derek Tan
6d955b88c3 Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 2014-09-11 05:16:35 +00:00
Junda Liu
7100d15a99 am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument. 
* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
  Add ForSubscriber suffix to APIs w/ subId argument.
 2014-09-10 01:00:59 +00:00
Junda Liu
13e28bb938 Add ForSubscriber suffix to APIs w/ subId argument. 
Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
 2014-09-09 17:50:09 -07:00
Wink Saville
6e9c5aeeee am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:46:37 +00:00
Wink Saville
bc0272754d Change suffix UsingSubId to ForSubscriber. 
Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
 2014-09-09 17:38:19 +00:00
Wink Saville
8110da62ed am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev 
* commit '26207b53a82f1e8f3d72eaf36bd69dbcb06833fc':
  Change getCurrentPhoneType to SystemApi
 2014-09-09 00:04:50 +00:00
Wink Saville
96b3e61ff6 Change getCurrentPhoneType to SystemApi 
Bug: 17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
 2014-09-08 16:52:03 -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
Junda Liu
b8025f3260 Hide APIs for simplified network settings. 
Bug: b/17255752
Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734
 2014-09-05 16:46:38 -07: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
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
Wink Saville
05e6dde3a0 ksd to lmp-sprout-dev 
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-09-01 05:38:31 +00:00
Diego Pontoriero
3892fc0349 Change TelephonyManager method name to accurately reflect functionality. 
Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260
 2014-08-28 13:50:36 -07:00
Junda Liu
cad78a801d Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev 2014-08-21 04:43:39 +00:00
Amit Mahajan
dbc6689664 Merge "Adding APIs to get IMEI/MEID" into lmp-dev 2014-08-21 00:16:54 +00:00
Amit Mahajan
284f1ec16e Adding APIs to get IMEI/MEID 
Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce
 2014-08-20 17:02:17 -07:00
Junda Liu
2b2469b07d Add getCdmaMdn and getCdmaMin as system api to telmgr. 
Bug: b/16966140
Change-Id: I36d8f850eca7c392f7ed5186254ef9862d4177f7
 2014-08-14 22:21:12 -07:00
Shishir Agrawal
64820af4e5 Add public qualifier to TelephonyManager.TeleiccExchangeSimIO. 
Seems to have gotten overlooked in the last change.

Bug: 17031384
Change-Id: If7f92c128ddddd606510d7acf88168aebc061e80
 2014-08-14 12:24:48 -07:00
Shishir Agrawal
43d94347a6 Return APDU status code on tramsit channel command failure. 
Change-Id: I2d506a6ddbb4e27a04f57941247924d36c9d279b
 2014-08-05 17:06:51 -07:00
Shishir Agrawal
a122e8df74 Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager. 
The new APIs are needed to support SEEK.

Also modifies TelephonyManager.iccOpenLogicalChannel to return the status of
the command.

Change-Id: Iff2674fb0e23210f2579cb883e64571347ade5e6
 2014-07-30 18:09:53 -07:00
Amit Mahajan
0bf65d2d71 Merge "Add API invokeOemRilRequestRaw" into lmp-dev 2014-07-24 15:35:58 +00:00
Steven Liu
3099c83144 Add API invokeOemRilRequestRaw 
this API is used by system app, app could communicate with RIL
with it.

Change-Id: I5397c1cf2b108d9dc3a9694b1f071dc60bb5b341

Conflicts:
	telephony/java/com/android/internal/telephony/ITelephony.aidl
 2014-07-24 10:15:49 -07:00
ram
e647099e14 IMS: getPCSCF() API enhanced to support multiple APN types. 
Change-Id: I014f341b93a9ea7280e04cdfc13418fe81c9fc8b
Signed-off-by: ram <ram.pl@samsung.com>
 2014-07-24 00:41:00 +00:00
Shishir Agrawal
63c4c06be4 Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi 
It will be required by setup wizard to delegate initialization to the carrier
app.

Change-Id: Icc0fc728e1e24235632ac38a482b06a7b829de78
 2014-07-23 15:29:50 -07:00
Shishir Agrawal
5552cc5c9d Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 2014-07-17 21:58:28 +00:00
Shishir Agrawal
86578cca38 Adding the ability for carrier app to override SPN and carrier name. 
The change allows system apps (holding MODIFY_PHONE_STATE permission) or
carrier apps to override the "carrier branding" on a per ICCID basis. The
override affects the service provider name as well as the network operator
name. The override is also saved as a SharedPreference and will persist for
the iccId across reboots.

Change-Id: I985ba247e10e2501e3d0d21567ccadc46f365879
 2014-07-17 16:31:37 -07:00
Nancy Chen
5da0fd5e76 API changes to enable account selection for a call 
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
 2014-07-17 10:19:20 -07:00
Derek Tan
06b41ea23f Remove @hide annotations from important carrier privileged APIs. 
Most of these APIs are protected by MODIFY_PHONE_STATE or carrier
privilege. Some APIs are protected by READ_PHONE_STATE.

Change-Id: Ifa04b5fb6d4bb5f21af7f728bee7dcbf77c8583b
 2014-07-16 09:32:57 -07:00
Ihab Awad
807fe0a19a Implement multi-SIM capabilities (1/6) [DO NOT MERGE] 
- Split PhoneAccount into PhoneAccount & PhoneAccountMetadata
- Move PhoneAccount methods from TelephonyManager to TelecommManager

Bug:16292368
Change-Id: Ib440368d6bd0572b63c942360450fde5c27d84b9
(cherry picked from commit 936b3552b4a3569be9904c826b95b632886fb45d)
 2014-07-14 18:19:27 +00:00
Wink Saville
391c8323fc Unhide isSmsCapable. 
Bug: 14113863
Change-Id: I57af2cf2482747e77c9bdf53559345b6b31f01a5
 2014-07-13 12:35:43 +00:00
Derek Tan
818631b679 Allow 1st party app to set Line 1 number for display purpose. 
After the number is set, TelephonyManager.getLine1Number will actually
return this one instead of the actual MSISDN/MDN.

Bug: 11900806
Change-Id: I4df3fac7b483ddae2bbda14b5a85629486e400cf
 2014-07-12 13:36:28 -07:00
Derek Tan
f9aefdb534 Different Mobile Network Settings screen for Nova multi-profile SIMs. 
Simplify the Mobile Network Settings screen regardless CDMA or GSM activeness
to provide a unified experience for Nova users.

For more details, please refer to b/15854628.

Bug: 15854628
Change-Id: Ieba04eff49824aa09a056cd4fb142cbd268207a3
 2014-07-12 10:36:58 -07:00