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 5523dc55d8
2017-08-17 21:30:30 -07:00
Nathan Harold
2a9da68e39
Merge "Cleanup ServiceState.toString()" into oc-mr1-dev
2017-08-18 01:59:06 +00:00
Jack Yu
9ba75e153e
Merge "Reduced the retry after disconnect delay" into oc-mr1-dev am: b70a55a7b5
...
am: f6b28f0b06
2017-08-17 18:35:22 +00:00
Jack Yu
f6b28f0b06
Merge "Reduced the retry after disconnect delay" into oc-mr1-dev
...
am: b70a55a7b5
2017-08-17 18:16:53 +00:00
TreeHugger Robot
b70a55a7b5
Merge "Reduced the retry after disconnect delay" into oc-mr1-dev
2017-08-17 18:04:40 +00:00
Jeff Davidson
96d9986d03
Merge "Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev am: f2a70fc116" into oc-mr1-dev-plus-aosp
...
am: f98abfaf81
2017-08-17 06:00:10 +00:00
Hall Liu
22b09c973d
Merge "Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41 am: c7ac478f51 am: e2f5f4b110" into oc-mr1-dev-plus-aosp
...
am: 701f31e343
2017-08-17 05:30:48 +00:00
Hall Liu
76344358dc
Merge "Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398 am: 34639cbbab am: e168449b32" into oc-mr1-dev-plus-aosp
...
am: 839a419bdb
2017-08-17 03:48:58 +00:00
Qingxi Li
1dd03d740e
Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev am: d339e30c26
...
am: c26df762c6
2017-08-17 03:38:33 +00:00
Jeff Davidson
c4d573345c
Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev
...
am: f2a70fc116
2017-08-17 03:02:42 +00:00
Hall Liu
faeb18da84
Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41 am: c7ac478f51
...
am: e2f5f4b110
2017-08-17 02:01:40 +00:00
Hall Liu
e2f5f4b110
Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41
...
am: c7ac478f51
2017-08-17 01:53:47 +00:00
Hall Liu
cb63a47d41
Merge "Revert "Fix lint errors in the streaming API""
...
am: 42d3eadb37
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 e1f10cbd7f
2017-08-17 00:46:24 +00:00
Hall Liu
ed85bf291a
Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398 am: 34639cbbab
...
am: e168449b32
2017-08-16 23:59:45 +00:00
Qingxi Li
c26df762c6
Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev
...
am: d339e30c26
2017-08-16 23:48:20 +00:00
Hall Liu
e168449b32
Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398
...
am: 34639cbbab
2017-08-16 23:40:02 +00:00
Jeff Davidson
0ac6e0e22c
Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public.
...
There is a reasonable use case for carrier apps to turn off this key
(b/64544341) so it should be visible to apps in the SDK.
Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3
Test: TreeHugger
Fixes: 64721199
2017-08-16 23:30:36 +00:00
Hall Liu
90b923f398
Merge "Fix lint errors in the streaming API"
...
am: b0f5d57489
2017-08-16 23:16:30 +00:00
Qingxi Li
d339e30c26
Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev
2017-08-16 23:03:48 +00:00
Hall Liu
b0f5d57489
Merge "Fix lint errors in the streaming API"
2017-08-16 22:51:13 +00:00
Jack Yu
5523dc55d8
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
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
2017-08-16 14:26:56 -07: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
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
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
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
2017-08-15 02:37:49 +00:00
nharold
3ce8557db0
Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819 am: c04cc3bb7e
...
am: 1f1d124bfe
2017-08-15 02:03:26 +00:00
Nathan Harold
0f6f6e261d
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
Merged-In: I56c4679d2a4a184f659870481e2ce0699fe38613
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
(cherry picked from commit 9acfe6f90a
2017-08-14 18:54:17 -07:00
nharold
1f1d124bfe
Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819
...
am: c04cc3bb7e
2017-08-15 01:50:04 +00:00
nharold
5b30d7b819
Merge "Cleanup ServiceState.toString()"
...
am: ee6e43c033
2017-08-15 01:29:00 +00:00
nharold
ee6e43c033
Merge "Cleanup ServiceState.toString()"
2017-08-15 01:12:28 +00:00
qingxi
cfffe7554f
Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION
...
Add EXTRA_FORCE_PROVISION for intent
ACTION_PROVISION_EMBEDDED_SUBSCRIPTION which will be used by the carrier
app to indentify whether the user chooses to use eUICC to set up the
cellular network in SUW.
Bug: 63869524
Test: E2E
Change-Id: I4d77fcd1ea62b98a885f3e1b78cc96ceed233e1d
2017-08-14 17:39:57 -07: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
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
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
2017-08-10 18:10:00 +00:00
Amit Mahajan
e6a10f5b6a
Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019
...
am: e1e32370e2
2017-08-10 17:46:01 +00:00
Amit Mahajan
e1e32370e2
Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7
...
am: 1a808fc019
2017-08-10 17:27:24 +00:00
Amit Mahajan
3466cda3d7
Merge "Get isim card data use subId."
...
am: 854edcff16
2017-08-10 16:06:36 +00:00
Chen Xu
0c2b4d7308
Merge "initial value for data_roaming based on carrier"
...
am: 973ddd55eb
2017-08-09 17:42:29 +00:00
Jack Yu
54ccaa0e99
Merge "Moved channels settings from carrier config to resources"
...
am: 79eddf8c0a
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
753961eba8
Merge "app link handling under restricted mobile data" into oc-dr1-dev am: 93bf6200eb am: aa73a69d3a
...
am: 9e3413d416
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
2017-08-08 09:08:42 +00:00
