Commit Graph

3889 Commits

Author SHA1 Message Date
Sooraj Sasindran
4c8fc962dc Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
am: cbbf530125

Change-Id: Id5ea5536246343a530f7579a31039421b3859de3
2017-02-10 03:03:38 +00:00
Sooraj Sasindran
0fc0a7edf7 Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

BUG=31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
2017-02-09 16:44:02 -08:00
Tyler Gunn
58d8c5eb07 Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e
am: 998655f80e

Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8
2017-02-08 22:05:45 +00:00
Tyler Gunn
998655f80e Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8
am: e55b11573e

Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
2017-02-08 22:01:07 +00:00
Tyler Gunn
ca5cdb2d10 Change prototype for "setCamera" in IMS VideoProvider.
Changing "setCamera" prototype to include the uid.

Test: Unit test, manual test.
Bug: 32747443
Merged-In: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Change-Id: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
2017-02-07 23:55:04 +00:00
Jack Yu
46c9c133e0 Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1
am: 84e84a73b7

Change-Id: I9aab25b14a5774ff5c7d64c5bc6a8aa5490d9ec0
2017-02-07 00:08:12 +00:00
Jack Yu
84e84a73b7 Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2
am: 7eac8ec7c1

Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
2017-02-07 00:04:04 +00:00
Jack Yu
4dfa6d3630 Renamed voiceNetworkStateChanged and dataNetworkStateChanged
The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.

Test: Build
Merged-In: Icf20ceb3718794f7aa62650816714ac8679d101a
Change-Id: Icf20ceb3718794f7aa62650816714ac8679d101a
2017-02-06 14:05:26 -08:00
Tyler Gunn
5819755163 resolve merge conflicts of d04c51ea37 to nyc-mr2-dev-plus-aosp
Test: Fix build.
Change-Id: I5808fc02502ced2195728ad146ef5523a8eb19ae
2017-02-03 13:41:17 -08:00
Tyler Gunn
d04c51ea37 Merge "Add "wifi lost" disconnect cause." am: 802b0c8fd1
am: 4e26b8e75e

Change-Id: I783d8693258d31341d946fa1f20e4c744ee410b3
2017-02-03 21:15:36 +00:00
Tyler Gunn
87f208b3b3 Add "wifi lost" disconnect cause.
New disconnect cause used when wifi call is dropped due to loss of wifi
connection.

Test: Manual, unit.
Merged-In: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Bug: 32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
2017-02-03 19:05:18 +00:00
Brad Ebinger
cc778dae0d Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc
am: 18140a6784

Change-Id: I1c29dcbdd4f1f1f97bf2e3eb3a1f0bdc83613676
2017-01-27 23:13:36 +00:00
Brad Ebinger
18140a6784 Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549
am: b5f2519abc

Change-Id: I54c577f6c4bd68f6328572651315e056270ee807
2017-01-27 23:08:31 +00:00
Brad Ebinger
e6ec7d8b8f Adds @hide ImsResolver API and device overlays (2/3)
- Adds config_ims_package device overlay, which specifies the default
package name to bind to.
- Adds config_dynamic_bind_ims device overlay, which determines
whether or not the new dynamic binding system is used.
- Adds @hide TelephonyManager API to interface with the ImsResolver

Test: Manual
Merged-In: I82a41da00e6da34629a40db431f13b968dfafe2e
Change-Id: I82a41da00e6da34629a40db431f13b968dfafe2e
2017-01-27 13:09:37 -08:00
Elliot Waite
9b21265b2c Fix @links in reference docs. am: 54de77470d am: ab978c035e
am: 28ba4722a9

Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b
2017-01-26 04:44:54 +00:00
Elliot Waite
28ba4722a9 Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
2017-01-26 04:39:57 +00:00
Brad Ebinger
ded1df24e0 Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0 am: 64057ab972
am: 2741442324

Change-Id: Ibd5c988226e7994c332a7e7f8b40a9338cf84e0f
2017-01-26 01:49:53 +00:00
Brad Ebinger
2741442324 Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0
am: 64057ab972

Change-Id: I901c72a38b522c190e849de55078036adc80d8b6
2017-01-26 01:46:06 +00:00
Elliot Waite
54de77470d Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
2017-01-25 17:00:55 -08:00
Brad Ebinger
024aaf2388 Adding Dynamic ImsService Binding (1/3)
Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option

Test: Unit Tests in opt/telephony
Bug: 30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
2017-01-25 15:12:28 -08:00
Polina Bondarenko
308bcec713 Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780 am: cf176500e6
am: b46a93ff04

Change-Id: I8f17bef7ccde5953f5b810bd806fc51a4c69e194
2017-01-23 17:20:58 +00:00
Polina Bondarenko
b46a93ff04 Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780
am: cf176500e6

Change-Id: Ic278e3a9bd7c9c99345150228c6e87343737079e
2017-01-23 17:14:35 +00:00
Treehugger Robot
6d064d8780 Merge "Make TelephonyManager#get/setAllowedCarriers system api" 2017-01-23 17:01:25 +00:00
Chen Xu
038bea5dd1 Merge "Initial change on carrier signal filtering" am: bfdce89f36 am: 1507930691
am: 923046251b

Change-Id: I0762a7787c4136de027f8ee5def592bc85be25b6
2017-01-20 04:13:03 +00:00
Chen Xu
923046251b Merge "Initial change on carrier signal filtering" am: bfdce89f36
am: 1507930691

Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841
2017-01-20 03:54:22 +00:00
Polina Bondarenko
d5cfe6cdf1 Make TelephonyManager#get/setAllowedCarriers system api
Make TelephonyManager#get/setAllowedCarriers system api under
PackageManager#FEATURE_TELEPHONY_CARRIERLOCK feature flag.

Bug: 33480084
Test: cts

Merged-In: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a

Change-Id: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a
2017-01-19 16:43:29 +01:00
fionaxu
3e713e090c Initial change on carrier signal filtering
- add new carrier config
- configure defaultcarrierapp as the default receiver for redirection
  signal

Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony

Change-Id: I094c39fe21e6883d2acef8f7479b948fc77ce14e
Merged-In: CHANGE-ID I14bb1a885d1eaca9a144eb1e1caca72339d67d2e
2017-01-19 00:36:16 -08:00
Ta-wei Yen
9e3a4957fc Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb am: ea0e111468
am: 89a85b0683

Change-Id: I24966bccbea07ac42d4199d71c59c76ae19c967a
2017-01-17 19:59:43 +00:00
Ta-wei Yen
89a85b0683 Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb
am: ea0e111468

Change-Id: Ie40ccdc2ad2a30e8bbf3d6a6c4013ff5faf10cdd
2017-01-17 19:53:42 +00:00
Ta-wei Yen
68d03b23bb Merge "Add getNetworkSpecifier() and getCarrierConfig()" 2017-01-17 19:38:27 +00:00
Polina Bondarenko
55745eca73 Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8 am: e2b306e30e
am: d4c48e911e

Change-Id: Iac1e5f257d6a8263c78af8d9199848244fe6d93c
2017-01-16 18:10:40 +00:00
Polina Bondarenko
d4c48e911e Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8
am: e2b306e30e

Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c
2017-01-16 18:02:32 +00:00
Treehugger Robot
dc61ad0ad8 Merge "Make TelephonyManager.getImei a system APIs." 2017-01-16 17:49:59 +00:00
Ta-wei Yen
eca691efcb Add getNetworkSpecifier() and getCarrierConfig()
This allows making network request and getting carrier config on a
specfic SIM.

Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Merged-In: Id52688d73b74bc55ee2da71a22454957fdd7b57b
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
2017-01-13 23:53:51 +00:00
Chen Xu
10839091d9 Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e
am: c90dc2072c

Change-Id: Ie694f05799bfeb123c7d12477855237444dff415
2017-01-13 21:15:55 +00:00
Chen Xu
c90dc2072c Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd
am: 1d0877f59e

Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
2017-01-13 02:33:24 +00:00
Chen Xu
4533b1ccdd Merge "Default Carrier app for traffic mitigation" 2017-01-13 02:22:38 +00:00
fionaxu
a21a87b7a4 Default Carrier app for traffic mitigation
- have the basic function working, support traffic mitigation and
  captive portal login
- support carrier customization, OEM could configure a list of carrier
  actions to act upon certain signals
- unit test

Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug: 30958215

Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d
2017-01-12 15:50:18 -08:00
Robert Greenwalt
907585c004 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
2017-01-12 23:20:45 +00:00
Robert Greenwalt
503d8fbb26 Merge "Add support for FDN contact dial" am: 082b118641
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598
2017-01-12 23:16:20 +00:00
Robert Greenwalt
082b118641 Merge "Add support for FDN contact dial" 2017-01-12 23:07:00 +00:00
Jordan Liu
11765b3fcc Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885
am: 1d67d022fb

Change-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3
2017-01-10 23:55:55 +00:00
Jordan Liu
1d67d022fb Merge "Fix naming of key" am: 0b74a1dabb
am: c68c2f6885

Change-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba
2017-01-10 23:44:43 +00:00
Jordan Liu
7c4bfb28d1 Fix naming of key
CarrierConfig Keys should start with "KEY_".

Test: runtest carrierconfig-unit
Change-Id: I317cdb53a09851a5e1a3832140c7dc28a5cde4a4
Merged-In: Iebb11739ae16e56fe1a0b2fdc9a3e005a71858dc
2017-01-04 14:46:29 -08:00
Robert Greenwalt
5f0dad0e64 resolve merge conflicts of e6b6653da8 to nyc-mr2-dev-plus-aosp
Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
2017-01-03 11:35:37 -08:00
Robert Greenwalt
e6b6653da8 Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am: 43ced5941e
am: 14a5b810b6

Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460
2017-01-03 17:40:27 +00:00
Robert Greenwalt
43ced5941e Merge "Add IMEI_NOT_ACCEPTED disconnect cause" 2017-01-03 17:26:59 +00:00
Joe LaPenna
dfee8e5f2d Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902
am: 715acea102

Change-Id: I44bc0113697be113ef79ac9a904485b49bed2f87
2016-12-22 21:51:57 +00:00
Joe LaPenna
715acea102 Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f
am: 6f87331902

Change-Id: I3681893e43949060922f72c65f8f106090005d14
2016-12-22 21:47:00 +00:00
Joe LaPenna
5e0164e16c Add simplified_network_settings_bool to CarrierConfig.
Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.

BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804
2016-12-22 11:53:10 -08:00