4575 Commits

Author SHA1 Message Date
Brad Ebinger
b3b09849bc Merge "Emergency redial implementation" 2017-08-25 20:05:53 +00:00
Shuo Qian
387ed22fef Merge "Add new error code in SmsManager" 2017-08-25 18:01:18 +00:00
Srikanth Chintala
fcb1501620 Emergency redial implementation
Define connection event to notify
Telecom/InCallUi about change in
account handle after redial and extra
for emergency phone handle.

Bug: 27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
2017-08-25 10:08:56 -07:00
sqian
85bb4b35f1 Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
Merged-In: I0b227e76048dd46d9c8023d37647db763e1e38e1
2017-08-24 14:40:59 -07:00
Treehugger Robot
573948c49c Merge "Add new telephony disconnect causes for low battery scenario." 2017-08-24 21:33:55 +00:00
Tyler Gunn
69388170d7 Add new telephony disconnect causes for low battery scenario.
LOW_BATTERY is for disconnect mid-call due to low battery.
DIAL_LOW_BATTERY is for failure while dialing due to low battery.

Test: Manual.
Merged-In: Ife7a4ca5645b3fb42ab20effb4d8d4a8fef8116b
Change-Id: Ife7a4ca5645b3fb42ab20effb4d8d4a8fef8116b
Fixes: 63936576
2017-08-24 13:08:01 -07:00
Hall Liu
8e47fe35c8 Embms adjustments for 7/28
* Move some vendor intents and extras into a VendorIntents class
* Add a download result RESULT_IO_ERROR
* Add documentation noting that repeated calls to
setTempFileRootDirectory will not throw an error if the parameter is the
same.
* Add getTempFileRootDirectory method for app
* Hide AIDL classes from the public/system API surfaces for download
* Remove size and md5hash from FileInfo

Change-Id: I8c968a7d68db2588ee550167ed2693fe89c5925a
2017-08-23 10:56:09 -07:00
Hall Liu
489dcb7cca Merge "Embms API adjustments for 7/21" 2017-08-23 16:37:50 +00:00
Hall Liu
d5c955fcdc Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
2017-08-22 17:07:48 -07:00
Amit Mahajan
fd528886c4 Make dun APNs as read-only by default.
Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: Iae2beede0e20810cba4d96f897756896adf77b30
2017-08-22 11:08:31 -07:00
Hall Liu
fa7e99ddf1 Merge "Fix lint errors in the streaming API" 2017-08-22 17:55:06 +00:00
Lorenzo Colitti
9335d2d0b1 Merge changes I325b13d5,I89719fe7
am: 23868e9c09

Change-Id: Iaced543ab17ea87c8f701975764d957bc1b17fc7
2017-08-19 03:15:08 +00:00
Treehugger Robot
23868e9c09 Merge changes I325b13d5,I89719fe7
* changes:
  Add tether offload traffic to interface stats as well.
  Tell the system when tethering offload hits a limit.
2017-08-19 03:05:14 +00:00
Lorenzo Colitti
f1912ca49a Add tether offload traffic to interface stats as well.
Currently, we only count add tethering traffic to per-UID
stats, but not to total data usage (i.e., dev and XT stats). This
is correct for software tethering, because all software forwarded
packets are already included in interface counters, but it is
incorrect for hardware offload, because such packets do not
increment interface counters.

To fix this:
1. Add an argument to ITetheringStatsProvider#getTetherStats to
   indicate whether per-UID stats are requested. For clarity,
   define integer constants STATS_PER_IFACE and STATS_PER_UID
   to represent these operations.
2. Make NetdTetheringStatsProvider return stats only if per-UID
   stats are requested. (Otherwise tethering traffic would be
   double-counted).
3. Make OffloadController's stats provider return the same
   stats regardless of whether per-UID stats were requested or
   not.
4. Make NetworkStatsService add non-per-UID tethering stats to
   the dev and XT snapshots. The per-UID snapshots were already
   correctly adding in per-UID stats.

(cherry picked from commit 5356a35c3bcfcdf2d184c620af6bfbf9bddf35c5)

Bug: 29337859
Bug: 32163131
Test: runtest frameworks-net
Test: runtest frameworks-telephony
Change-Id: I325b13d50e88841dfb0db4c35e7e27f163ee72fe
Merged-In: I4e8e923d68dce1a4a68608dbd6c75a91165aa4ee
2017-08-19 10:12:05 +09:00
Hall Liu
ee19cfc386 Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: If4a9a5533a235a8cc56762ab7a9e32ec89440f1d
2017-08-18 14:36:06 -07:00
Jack Yu
f7149eb698 resolve merge conflicts of d5cb58c693de to stage-aosp-master
Test: I solemnly swear I did not test this conflict resolution.

Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: I9494087c5a90bccc4326c173bf6395996da357af
2017-08-17 23:20:59 -07:00
Treehugger Robot
d5cb58c693 Merge "Reduced the retry after disconnect delay" 2017-08-18 05:52:16 +00:00
Jack Yu
950d217406 Reduced the retry after disconnect delay
Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
(cherry picked from commit 5523dc55d808998af4402431265e085e62bf6dd1)
2017-08-17 21:30:30 -07:00
Hall Liu
cb63a47d41 Merge "Revert "Fix lint errors in the streaming API""
am: 42d3eadb37

Change-Id: I4229c1eb42edba2c2c7df08f87bfded5402c01c7
2017-08-17 01:30:56 +00:00
Hall Liu
42d3eadb37 Merge "Revert "Fix lint errors in the streaming API"" 2017-08-17 01:22:19 +00:00
Hall Liu
591fea2504 Revert "Fix lint errors in the streaming API"
This reverts commit e1f10cbd7ff6128171b6ab37b3afbfdc3d9f9f33.

Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
2017-08-17 00:46:24 +00:00
Hall Liu
90b923f398 Merge "Fix lint errors in the streaming API"
am: b0f5d57489

Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401
2017-08-16 23:16:30 +00:00
Hall Liu
b0f5d57489 Merge "Fix lint errors in the streaming API" 2017-08-16 22:51:13 +00:00
Hall Liu
e1f10cbd7f Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: I94e1bcccea4b9f50dae4c93f247ab78058d15bb5
2017-08-16 11:33:40 -07:00
nharold
5b30d7b819 Merge "Cleanup ServiceState.toString()"
am: ee6e43c033

Change-Id: Ida4fc7c5cce8c763a5b8baf544d8244934e7c193
2017-08-15 01:29:00 +00:00
nharold
ee6e43c033 Merge "Cleanup ServiceState.toString()" 2017-08-15 01:12:28 +00:00
Nathan Harold
9acfe6f90a Cleanup ServiceState.toString()
Updating the formatting of the toString() method to
name the fields that it's printing, and to use one of
the more common formats for object dumping.

Bug: 64300932
Test: compilation, dumpsys
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
2017-08-14 13:27:44 -07:00
Tyler Gunn
63769af59d Merge changes from topic 'call-session-may'
am: 21e4dbb6ed

Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
2017-08-11 18:33:44 +00:00
Tyler Gunn
21e4dbb6ed Merge changes from topic 'call-session-may'
* changes:
  Add callSessionMayHandover API to ImsCallSession.
  IMS: Support for Possible Call Session Handover
2017-08-11 18:14:02 +00:00
Brad Ebinger
44da663308 Merge "Change IMS callback AIDLs to be oneway"
am: a46600e0e7

Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
2017-08-11 00:42:30 +00:00
Treehugger Robot
a46600e0e7 Merge "Change IMS callback AIDLs to be oneway" 2017-08-11 00:31:41 +00:00
Brad Ebinger
0f4db7d193 Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.

This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.

Bug: 63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
2017-08-10 23:15:41 +00:00
Brad Ebinger
bc13df8ce8 Merge "Add method that checks the Binder status of ImsConfig"
am: 6ffc855e8d

Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
2017-08-10 23:02:56 +00:00
Brad Ebinger
6ffc855e8d Merge "Add method that checks the Binder status of ImsConfig" 2017-08-10 22:50:45 +00:00
Amit Mahajan
cfbd4a354a Merge "The method of parseEfSpdi does not match TS24008."
am: cd03d0db9d

Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
2017-08-10 16:12:19 +00:00
Amit Mahajan
3466cda3d7 Merge "Get isim card data use subId."
am: 854edcff16

Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
2017-08-10 16:06:36 +00:00
Amit Mahajan
cd03d0db9d Merge "The method of parseEfSpdi does not match TS24008." 2017-08-10 15:59:43 +00:00
Brad Ebinger
9cf842c531 Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.

Bug: 62723694
Test: maual, follow bug procedure
Merged-In: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
2017-08-09 16:56:42 -07:00
Chen Xu
0c2b4d7308 Merge "initial value for data_roaming based on carrier"
am: 973ddd55eb

Change-Id: I374dd9e18f9e3bc5e9fe1ea945923f81df90fa15
2017-08-09 17:42:29 +00:00
Chen Xu
825345628c Merge "Handle invalid destination address gracefully"
am: a753dfd2e8

Change-Id: I103f925d8008748b5cc5e15a48f0773c092e293a
2017-08-09 07:24:05 +00:00
Jack Yu
54ccaa0e99 Merge "Moved channels settings from carrier config to resources"
am: 79eddf8c0a

Change-Id: If2c2e6e1d260fae50a15c8a3aa8fba4460884ec1
2017-08-09 07:16:37 +00:00
yanxue.xu
9957f979e1 Get isim card data use subId.
Get isim card data is obtained the default card data instead of the corresponding card data.
It is necessary to obtain the card data according to the subid.
Test: Get isim card data use subId.

Change-Id: I9ad90f8180f35449879507b6f086c4be01aacc9d
2017-08-09 14:58:25 +08:00
Chen Xu
973ddd55eb Merge "initial value for data_roaming based on carrier" 2017-08-09 01:19:24 +00:00
Chen Xu
a753dfd2e8 Merge "Handle invalid destination address gracefully" 2017-08-09 01:09:42 +00:00
fionaxu
715b812e75 initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.

Bug: 36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
2017-08-08 17:08:46 -07:00
fionaxu
b50183d2fd Handle invalid destination address gracefully
Bug: 37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
2017-08-08 16:41:23 -07:00
Jack Yu
0fc9492176 Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.

Test: Manual
bug: 31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
2017-08-08 15:34:28 -07:00
Tyler Gunn
71c29cfad9 Add callSessionMayHandover API to ImsCallSession.
This matches the new AIDL definition in the API.

Test: Manual
Bug: 62489988
Change-Id: I97ad5b5359f19d533b5b8644fd37008c0c69bf9c
2017-08-08 13:10:48 -07:00
Anju Mathapati
efed6f6bd4 IMS: Support for Possible Call Session Handover
Adding the callSessionMayHandover API that allows
for the lower layers to indicate that the call session
may handover based on actions taken by the user/UI
layer.
The API provides current and target RAT information
pertaining to the possible handover.

Bug: 62489988
Test: Manual
Change-Id: I006462ce5688bb99a94d5135574fb2c17878685a
2017-08-08 12:52:53 -07:00
Jonathan Basseri
7728849a39 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593
2017-08-02 01:58:18 +00:00