Commit Graph

4808 Commits

Author SHA1 Message Date
Pankaj Kanwar
7a9834a4a8 Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev am: 539c15ec84
am: 45d1aadd50

Change-Id: Ie61db69d0fc26d83f34399ac892e0129319bc318
2017-08-16 17:22:48 +00:00
Pankaj Kanwar
45d1aadd50 Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev
am: 539c15ec84

Change-Id: I63ff9c84bfb5582575f8e2098b02ff7f77a51287
2017-08-16 01:31:31 +00:00
pkanwar
68e3de7214 Show notification when VoWiFi is active, and user is out of service for
voice.

Bug: 62618428
Test: manual
Change-Id: Ic630991da3199584dd313a8bf3138b020ecebd5c
2017-08-15 20:57:08 +00:00
nharold
3ff89cfa5f Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819 am: c04cc3bb7e am: 1f1d124bfe
am: 3ce8557db0

Change-Id: I283bc89a497bf10ab6fad6062f052de8929ddd8d
2017-08-15 02:37:49 +00:00
nharold
3ce8557db0 Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819 am: c04cc3bb7e
am: 1f1d124bfe

Change-Id: I0c9e33c10ce673ed00bfe97b38ae671548d21201
2017-08-15 02:03:26 +00:00
nharold
1f1d124bfe Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819
am: c04cc3bb7e

Change-Id: Id03de78c19dd4995b4702a238d79ac3e4278f3ec
2017-08-15 01:50:04 +00: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
9ec7f7985a Merge "Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a am: 1cdd44bd9d am: 793c4be8d4" into oc-mr1-dev-plus-aosp
am: d6fab9dae9

Change-Id: Idde114d46da5c18a9bdf13fb1580a4d3f95c0718
2017-08-10 18:17:45 +00:00
Amit Mahajan
aae533fba1 Merge "Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019 am: e1e32370e2" into oc-mr1-dev-plus-aosp
am: eacbe710dc

Change-Id: I6b2ff0bd59063d94c3e0c2df427b2037da606265
2017-08-10 18:10:00 +00:00
Amit Mahajan
3d9c4fa14f Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a am: 1cdd44bd9d
am: 793c4be8d4

Change-Id: I4c7b7180fe9b56b5d7483f435a6d70530d89295f
2017-08-10 17:54:12 +00:00
Amit Mahajan
e6a10f5b6a Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019
am: e1e32370e2

Change-Id: Ice6d00e2cdfc7b3afff23b3a64d50afc85a56830
2017-08-10 17:46:01 +00:00
Amit Mahajan
793c4be8d4 Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a
am: 1cdd44bd9d

Change-Id: I8ed8d16910331f09a0e44e908e7ac89e990af141
2017-08-10 17:34:07 +00:00
Amit Mahajan
e1e32370e2 Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7
am: 1a808fc019

Change-Id: I27f67b172bd8096ee00b9c80bb9699b33eff97f7
2017-08-10 17:27:24 +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
fionaxu
753961eba8 Merge "app link handling under restricted mobile data" into oc-dr1-dev am: 93bf6200eb am: aa73a69d3a
am: 9e3413d416

Change-Id: Id9063cf44028d08f44fcf3ec2a397cf6286d4d7a
2017-08-08 09:15:27 +00:00
fionaxu
9e3413d416 Merge "app link handling under restricted mobile data" into oc-dr1-dev am: 93bf6200eb
am: aa73a69d3a

Change-Id: Idbfec034c44a355ddcf702bbfffea8107a48f702
2017-08-08 09:08:42 +00:00
fionaxu
aa73a69d3a Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: Ic662de15a4cd95a77f509f1aaa56ea3bf6ae4b35
2017-08-08 09:02:26 +00:00
fionaxu
a40b8b7431 Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
2017-08-08 09:02:23 +00:00
TreeHugger Robot
93bf6200eb Merge "app link handling under restricted mobile data" into oc-dr1-dev 2017-08-08 08:57:16 +00:00
Jonathan Basseri
47a639b4e6 Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am: 35a563ef62
am: b901f055b5

Change-Id: I8ebdd09774cf7f04ee8abe09c4efe9fefef047cb
2017-08-07 16:30:38 +00:00
Jonathan Basseri
c75e254eb4 Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am: 35a563ef62

Change-Id: I1c2b048dd8375ca7e6afca552241c5bbbfc41021
2017-08-07 16:26:06 +00:00
Jonathan Basseri
b901f055b5 Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am: 35a563ef62

Change-Id: Ib898af17ce2985a1e19759dd9296f3cea8077018
2017-08-07 16:24:31 +00:00
fionaxu
d60a9d0e58 app link handling under restricted mobile data
1. new actions to allow default carrier app dynamically enable/disable
app-link filtering
2. new intent to notify registered carrier apps of other default
networks
3. signal-to-actions config to sepcify carrier actions on default
network change
default network available -> disable intent filter for app-link
defaut network lost -> enable intent filter for app-link
4. new carrier actions to allow carrier apps to register/unregister
other network status dynmacially

Bug: 62487488
Test: Manual
Change-Id: Ie9fa9f3f4ca38f9f26a90a3dbf95f7f20a8ad773
2017-08-04 18:13:12 -07:00
Jonathan Basseri
6442cc90b5 Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Merged-In: I64f31d111213281edeaeda6a09b163b860261b2d
Change-Id: I541b445b410329798acdaaaccc50955cd1574ae2
2017-08-04 16:53:03 -07:00
Jonathan Basseri
dd2f23431e Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Change-Id: I64f31d111213281edeaeda6a09b163b860261b2d
(cherry picked from commit 83c25b8ce17c3ce387d87d5f36182645e686540e)
2017-08-03 18:18:59 -07:00
Jonathan Basseri
8a1ecd711a Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit 2b9aa9e9d1.

Change-Id: I2787f2bd9cd5afe3fde8afdbb62dc255718fe654
2017-08-04 00:18:28 +00:00
Jonathan Basseri
2b9aa9e9d1 Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Change-Id: I541b445b410329798acdaaaccc50955cd1574ae2
(cherry picked from commit 83c25b8ce17c3ce387d87d5f36182645e686540e)
2017-08-03 14:16:02 -07:00