Commit Graph

2243 Commits

Author SHA1 Message Date
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
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
3466cda3d7 Merge "Get isim card data use subId."
am: 854edcff16

Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
2017-08-10 16:06:36 +00: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
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
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
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
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
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
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
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
96bfbcdcd4 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39
am: 0fed7e3282

Change-Id: If811c7aa40c5be4b0ffcfa5addef8c4b147a1c71
2017-08-02 02:27:55 +00: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
Jonathan Basseri
89a2a41572 Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6
am: aaeca1e977

Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a
2017-08-02 01:51:21 +00:00
Jonathan Basseri
85a215bae7 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" 2017-08-02 01:44:09 +00:00
Jonathan Basseri
379128e5c2 Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit 6f4657363c.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
2017-08-02 01:10:47 +00:00
Jonathan Basseri
02cc8151a6 Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
2017-08-01 22:34:44 +00:00
Jonathan Basseri
58bbef15d8 Merge "Move getNetworkCountryIso impl from TM to PIM." 2017-08-01 22:25:28 +00:00
Jonathan Basseri
6f4657363c 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: I8463af8ed427b73b57a4076c0ff79f055c697657
2017-08-01 22:24:05 +00:00
Hall Liu
76716535d9 Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c
am: 7a83a8ac77

Change-Id: Ia07b24d0b75d39144be8fb211ca6c2d84e24718a
2017-07-28 02:57:24 +00:00
Hall Liu
8c4179e88c Merge "Un-hide the MBMS streaming APIs"
am: a50e17aea2

Change-Id: Icd8ebf0e351914cdfb0f0c15343e2d2024706d6b
2017-07-28 02:40:20 +00:00
Hall Liu
2398921320 Un-hide the MBMS streaming APIs
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.

Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
2017-07-27 15:38:36 -07:00
Hall Liu
a3011a0401 Merge "Make slight API and doc adjustments" am: b7e10650d8 am: 14be4e65b2
am: 0f18557df8

Change-Id: I84aa982760377be0df6f8fbca6d5a32d1036f16a
2017-07-21 21:29:24 +00:00
Hall Liu
14be4e65b2 Merge "Make slight API and doc adjustments"
am: b7e10650d8

Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87
2017-07-21 21:18:42 +00:00
Hall Liu
b7e10650d8 Merge "Make slight API and doc adjustments" 2017-07-21 21:09:34 +00:00
Amit Mahajan
f4292bacf9 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am: 37a9991be9

Change-Id: Ib0cd3d66a4eef9d93e8f952dfd528d0cf714e8e5
2017-07-20 20:58:39 +00:00
Amit Mahajan
37a9991be9 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev 2017-07-20 20:47:17 +00:00
Hall Liu
64a98f9646 Make slight API and doc adjustments
* Fix a compile error on Java 7
* Update initialization mechanism to allow exceptions and return codes
* App-facing api for StreamingService#dispose no longer throws an
IllegalArgumentException
* Add REASON_NONE to stream state change reasons

Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
2017-07-20 13:31:52 -07:00
Robert Greenwalt
7acfec846b Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9
am: 12286b2608

Change-Id: Iff3707dab4ee737e5de2b1b8bded811f919553a8
2017-07-20 00:42:21 +00:00
Robert Greenwalt
5f047a68d9 Merge "Add details to Download progress callback"
am: b440b572d7

Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
2017-07-20 00:30:50 +00:00
Robert Greenwalt
0ebff46583 Add details to Download progress callback
Split decode into max size and current size.

Test: builds
Change-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7
2017-07-19 15:02:29 -07:00
Chen Xu
47208e2cf5 Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
am: 068397a319

Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31
2017-07-19 03:12:33 +00:00
Chen Xu
068397a319 Merge "initial value for data_roaming based on carrier" into oc-dr1-dev 2017-07-19 03:06:01 +00:00
fionaxu
7834be2a3c 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-07-18 17:32:52 -07:00
Amit Mahajan
d497794934 Add new column user_editable to Carriers table in telephony db.
Test: Verified manually that an APN with user_editable=false cannot be
modified via UI
Bug: 62852457
Change-Id: I67f1c5c537978d54aeea0a726d4056593381aa2d
2017-07-18 16:58:52 +00:00
Naveen Kalla
7e15c58085 resolve merge conflicts of b78661052c to oc-dr1-dev-plus-aosp
Bug: 62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 20:49:08 -07:00
Hall Liu
7b8d8578de Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9
am: f83fb827a7

Change-Id: I90910fd62a74d7518d69c409eeb6cc8f4a7bb6f2
2017-07-14 02:54:29 +00:00
Hall Liu
d98024a1f9 Merge "Clean up streaming API docs and organize errors"
am: d2c8dcfcfe

Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab
2017-07-14 02:43:10 +00:00
Naveen Kalla
abd2842ce1 Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
      string is converted as expected.

Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 15:08:51 -07:00
Hall Liu
46cbcd1b4a Clean up streaming API docs and organize errors
* Implement listPendingDownloads and resetDownloadKnowledge
* Bring MbmsStreamingManager docs in line with vendor-side API docs.
* Remove activeStreamingServicesUpdated
* Reorganize the errors in MbmsException into categories.
* Add some vendor API docs for file-download

Change-Id: Ia29066ea6f2c0414171cffa1ae11bb467f187bee
2017-07-12 16:53:12 -07:00
Hall Liu
81d9c6fe71 Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222
am: 9888af1dfc

Change-Id: I98d30f379072302a5e76a8b157d8aecdd1616235
2017-07-12 23:44:51 +00:00