2346 Commits

Author SHA1 Message Date
Cheuksan Wang
b72351da56 Merge "Add an API call to update the status of a pending outbound SMS message and resend by PSTN if necessary." 2014-06-23 17:14:09 +00:00
Cheuksan Wang
87487466af Add an API call to update the status of a pending outbound SMS message and
resend by PSTN if necessary.

Change-Id: Id847b182874bef057473acf293cee43d9d55f7ab
2014-06-19 18:51:13 -07:00
Ye Wen
369a107fd6 Move IMms.aidl to frameworks/base (2/3)
Change-Id: Ia771496f92a841c72d950212b2f525aa0c733d7f
2014-06-18 18:25:20 -07:00
Robert Greenwalt
19f01ebe90 Merge "Remove Obsolete enable/disableApn functions." 2014-06-17 21:43:29 +00:00
Robert Greenwalt
e356825e4a Remove Obsolete enable/disableApn functions.
ConnectivityService now uses NetworkAgents instead and apps should use
ConnectivityManager.

Change-Id: Ifc5c8f5be802183e70a5d92b224c819815de00e6
2014-06-17 14:10:39 -07:00
Wink Saville
b576cec262 Merge "Empty triangle displayed for radio signal but calls & data work" 2014-06-17 21:03:08 +00:00
Wink Saville
eeacf93747 Empty triangle displayed for radio signal but calls & data work
TelephonyRegistry: when default sub id is requested set isLegacyApp to
true so when ACTION_DEFAULT_SUBSCRIPTION_CHANGED is received the
TelephonyRegistry.Record.subId will be updated.

SubInfoRecord: Add SubInfoRecord toString for easier debugging

SubscriptionManager: Add putPHoneIdAndSubIdExtra(intent, phoneId, subId)
as this allows explicit setup of phoneId and subId and does not rely on
a phone's subId being set.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
2014-06-18 01:07:10 -07:00
Ihab Awad
c35ad0252d Add methods to TelephonyManager for Subscription management (1/3)
As part of the effort to permit third-party suppliers of telephone
connectivity, we permit clients of TelephonyManager to obtain the
currently valid Subscription objects describing these suppliers. The
Subscriptions are intended to be self-describing such that an end-user
can choose from among them based on the information they contain. One
of these objects may then be attached to an ACTION_DIAL or ACTION_CALL
Intent to represent the end-user's choice of how to make a call.

Change-Id: I2ad1930079042d7bfe762b47c22f0538f7403bff

Conflicts:
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Conflicts:
	telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
2014-06-17 15:08:13 -07:00
Wink Saville
1b5916b26e Check for subId array being null.
Bug: 15665102
Change-Id: I9424da81311eacebf280a30c4e32a530be4a3278
2014-06-16 11:48:33 -07:00
Wink Saville
fb40dd4d00 Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-13 13:30:57 +00:00
Anil Muthineni
5d3c5fc115 Add api to inject SMS PDUs
Change-Id: I58a518a7a6d6f43fef3d989bc0c8b21959404ed0
2014-06-12 17:44:22 +00:00
Jeff Brown
d5a5b5a547 Rename PrivateApi annotation to SystemApi.
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
2014-06-06 15:16:27 -07:00
Yorke Lee
282129fd3f API changes to Telephony per API review
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
2014-06-06 09:29:32 -07:00
Yorke Lee
8c2d8c0c27 Revert "API changes to Telephony per API review"
The original change was submitted into lmp-preview-dev and should
not have been auto-merged to master.

This reverts commit 80327f7a31b19213ec48e1ab66e6bdc8e76cb0fe.

Change-Id: I9ff8a868ffa3135583c52ef97b15311107716899
2014-06-05 22:55:49 +00:00
Yorke Lee
f537259ec4 am 87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev
* commit '87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
  API changes to Telephony per API review
2014-06-05 22:23:03 +00:00
Yorke Lee
d8819baf85 API changes to Telephony per API review
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

* Hide DisconnectCause
Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
2014-06-05 13:48:12 -07:00
Ihab Awad
fbb092f26e DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
(cherry picked from commit 976bfe497da31fa8322969648ffbe77898941d0c)
2014-06-05 12:56:57 -07:00
Ihab Awad
fc91b7d448 DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
2014-06-04 23:25:04 +00:00
Evan Charlton
faa3ff9ba8 Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev 2014-06-03 03:47:06 +00:00
Santos Cordon
b69f1bddfe am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev
* commit '6d052adc910bf2d2775881528cef3e41fe2cd14b':
  Update showCallScreen to use Telecomm (1/6)
2014-05-30 21:38:54 +00:00
Santos Cordon
3534ede572 Update showCallScreen to use Telecomm (1/6)
- Add API methods to InCallService and ITelecommService.
- Remove old methods from ITelephony.
- Route the TelephonyManager methods through ITelecommService instead of
  ITelephony.
- Update Lock screen to use TelephonyManager instead of ITelephony.

Bug: 15008165
Change-Id: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
2014-05-30 11:35:42 -07:00
Evan Charlton
fda1855eaa Revert sendEnvelope changes [DO NOT MERGE]
Revert the following changes from the I/O preview. This reverts the
following changes:

Revert "Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."""

This reverts commit 452e185fb6df92358701fb68d4fe6c65f172cc29.

Change-Id: I6bbff508b2f542d6ef3d372956db53d63a9165eb

Revert "Revert "Revert "Expose sendEnvelope."""

This reverts commit 0d5e5b9cce8af40494f72ff9decc169f99780254.

Revert "Adding support for SIM communication from Android over logical channels."

This reverts commit 57f656b9f6271cf857b5ecec5f8c7eacb321ec0b.

Change-Id: I975eb468841e85d63e506f68a5d8c879e110d9f6
2014-05-29 10:55:05 -07:00
Robert Greenwalt
5acfa70a18 Fix build.
Add Constant opt/telephony project was requiring.  I suspect there is a change
coming that will add this and perhaps more, but this fixes the build.

Change-Id: I8f994c0cf9ed37f14dc7ae9368da07fe8cd76aec
2014-05-28 20:25:15 -07:00
Santos Cordon
3afed57a7d Adding ITelecommService definition for Telecomm.
Until telecomm code moves into a system service, we need a way for
other apps to call into it for call-related functionality.

Initial implementation only has silenceRinger.
This is to be implemented by the telecomm code and used by
TelephonyManager (until we have a TelecommManager).

Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit b895606acf18dbb050c9a32106b3c9c2e5111829)
2014-05-28 03:36:36 +00:00
Robert Greenwalt
afa05c0b43 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
2014-05-27 20:28:50 +00:00
Wink Saville
d42f945a3c Hide LogicalChannel operations developer preview.
Bug: 15193354
Change-Id: I0e41ab7bd8bb3aab9af855f022cb89349802f63f
2014-05-26 09:01:20 -07:00
Santos Cordon
5c013261a9 Merge "Adding ITelecommService definition for Telecomm." 2014-05-22 21:21:41 +00:00
Santos Cordon
6848f72a49 Adding ITelecommService definition for Telecomm.
Until telecomm code moves into a system service, we need a way for
other apps to call into it for call-related functionality.

Initial implementation only has silenceRinger.
This is to be implemented by the telecomm code and used by
TelephonyManager (until we have a TelecommManager).

Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
2014-05-21 22:49:09 -07:00
Robert Greenwalt
47eecf0330 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
2014-05-21 21:34:05 -07:00
Santos Cordon
cb9086c5bf Fix build break.
Change-Id: If80984f9a62809829b3767193eff981ccb1185c7
2014-05-19 09:25:13 -07:00
Santos Cordon
94a873de0f Merge "Remove methods added in TelephonyManager." 2014-05-19 15:18:51 +00:00
Santos Cordon
14816d669b Remove methods added in TelephonyManager.
Change-Id: I771502ab76dfc24eb19b9ff58b029bea45d6832c
2014-05-16 17:58:09 -07:00
Evan Charlton
b8894ab1ae Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750.

Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
2014-05-16 13:31:26 -07:00
Evan Charlton
210889e91c Revert "Revert "Expose sendEnvelope.""
This reverts commit 23745256000bffaad4038ad9fe6e2b0941074a53.
2014-05-16 12:50:13 -07:00
Evan Charlton
4a644e3903 Merge "Remove obsolete ThirdPartyCall APIs" 2014-05-14 22:08:21 +00:00
Evan Charlton
fcca6cd019 Merge "Revert "Expose sendEnvelope."" 2014-05-14 22:08:10 +00:00
Evan Charlton
605e4942d6 Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."" 2014-05-14 22:07:47 +00:00
Evan Charlton
0082e3302f Remove obsolete ThirdPartyCall APIs
These should have been reverted long ago. Additional cleanup will need
to happen, but this is a good first pass.

Change-Id: I6d3c2919299c0a0b9714ffecd30da68e5c880b6a
2014-05-14 15:05:47 -07:00
Andrew Lee
4268b243de Merge "Handle normalization of a "null" phone number." 2014-05-14 21:44:39 +00:00
Evan Charlton
8f402c36cb Revert "Expose sendEnvelope."
This reverts commit 6eac2ee0fc8a652c4cb1e7ca6602a080d4f82dbd.

Change-Id: Ie04a873bb1d4935208e687917e86cbe80312a6d1
2014-05-14 14:02:21 -07:00
Evan Charlton
c0d138ab86 Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."
This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976.
2014-05-14 14:01:47 -07:00
Ed Heyl
2cf184233b merge master nova by hand, skipped translations
Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
2014-05-14 13:24:53 -07:00
Andrew Lee
b31c310fcf Handle normalization of a "null" phone number.
Bug: 14900155
Change-Id: I1c4c5c6dec4c4c470b436102c72a7476d3d5237c
2014-05-14 13:00:28 -07:00
Robert Greenwalt
f9cb86aebe Replace LinkCapabilities with NetworkCapabilities
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
2014-05-12 16:52:56 -07:00
Wink Saville
784f90facf am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '192384bb2708c49ca6c91432b8c848f43557429a':
  Add support for NETWORK_TYPE_GSM
2014-05-01 18:07:58 +00:00
Wink Saville
51d427ca9b am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '437994578272f9770748b152c53ec655059d19ec':
  Add support for NETWORK_TYPE_GSM
2014-05-01 18:03:57 +00:00
Wink Saville
74ec580873 am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '7e411f74efe6dd383e59634760cccd96da1c209b':
  Add support for NETWORK_TYPE_GSM
2014-05-01 17:57:51 +00:00
Sandeep Kunta
10731a6140 Add support for NETWORK_TYPE_GSM
Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries for getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.

Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
2014-05-01 17:53:42 +00:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Wink Saville
994a9a39b5 am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57':
  Telephony: Add functionality to handle ICC IO error
2014-04-26 00:35:49 +00:00