Thierry Strudel
ece721f8cd
Merge "Update UsbService to V1_1 usb hal"
2017-04-27 03:28:12 +00:00
Badhri Jagan Sridharan
ef4b303fc2
Update UsbService to V1_1 usb hal
...
This CL adapts Usb service to V1_1 hal.
V1_1 hal supports reporting audio_adapter accessory
and debug accessory.
Bug: 36604276
Test: Manually test inserting an Audio accessory.
Also tested to made sure that change is compatible with V1_0
implementations
Change-Id: I8e44f5e9ae14b0e41965e8d355c99ac42af93f23
2017-04-26 21:43:07 +00:00
Jeff Sharkey
e00742f4c5
Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
...
am: db73950734
Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d
2017-04-26 00:41:04 +00:00
Jeff Sharkey
db73950734
Merge "Fix some issues found by new doclava linter." into oc-dev
...
am: a00c7c0a99
Change-Id: I940b5ab896e4638e8178868acb65d79c078adbbe
2017-04-25 22:25:09 +00:00
Jeff Sharkey
a00c7c0a99
Merge "Fix some issues found by new doclava linter." into oc-dev
2017-04-25 22:11:01 +00:00
Jeff Sharkey
0f3f60b576
Fix some issues found by new doclava linter.
...
Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.
Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
2017-04-25 13:12:45 -06:00
Nathan Harold
5a209621d3
Merge "Remove the docstring dependency on telephony-common" into oc-dev am: b06ff6f256
...
am: 49d4e5e413
Change-Id: Iabd238e291c882db18b4bca2171b7c9b5bcff9d2
2017-04-25 05:21:39 +00:00
Nathan Harold
49d4e5e413
Merge "Remove the docstring dependency on telephony-common" into oc-dev
...
am: b06ff6f256
Change-Id: I62bf5f96f48b4e16e48055b490b4da92096f133e
2017-04-25 05:13:24 +00:00
Jakub Pawlowski
5053314e05
Merge "Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14 am: 2fb02a252c am: 526719a1a2" into oc-dev-plus-aosp
...
am: 28a9a1a61e
Change-Id: I1b3a962d28ff95aaf147afb0032ab7bc6495611b
2017-04-24 21:47:56 +00:00
Tomasz Wasilczyk
22eb0e316d
Merge "Pass radio HAL callbacks back to Java client."
2017-04-24 20:19:10 +00:00
Jakub Pawlowski
c4434b341a
Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14 am: 2fb02a252c
...
am: 526719a1a2
Change-Id: I432069ce857ec9d79c8afae6e8c278a7fd8e97ca
2017-04-24 19:16:52 +00:00
Jakub Pawlowski
89e10d3eb4
Get rid of the IAdvertiserCallabck
...
Bug: 30622771
Test: none
Change-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971
2017-04-24 15:42:57 +00:00
Tomasz Wasilczyk
2134817b39
Pass radio HAL callbacks back to Java client.
...
Test: instrumentation, manual (KitchenSink)
Bug: b/36863239
Change-Id: I5019929bfafcdd82f62f5b81aed5c7ac796e05f1
2017-04-22 19:54:18 -07:00
Hall Liu
6611a88da1
Merge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842 am: 4779240573
...
am: 404acdc8a1
Change-Id: I70e694f5e1adcf382f2ac93ef25aa7298ec9dd52
2017-04-22 02:20:46 +00:00
Hall Liu
404acdc8a1
Merge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842
...
am: 4779240573
Change-Id: I56a0c0dc4ddbb3d168c1a386e92158b4a1d2bdde
2017-04-22 02:12:58 +00:00
Robert Greenwalt
4dded7a1b5
Second pass of eMBMS api.
...
Updating Streaming apis. Adding midwear aidl files.
Updating Download apis.
Making it Compile..
Test: none yet
Change-Id: I3f44ef3f6690274af1dc2002bc02e6668fe23248
2017-04-20 12:17:37 -07:00
Jaewan Kim
c8d846ffef
Add callback for AVRCP 1.6 support
...
Bug: 33828042
Test: Build
Change-Id: Iaf5cecfa38065cfeed096929952559d7cb2e248b
2017-04-18 20:16:13 +00:00
Nathan Harold
7d70c8a085
Remove the docstring dependency on telephony-common
...
There should no longer be a requirement for frameworks/base
to rely on telephony-common, so we should remove this
possible source of circular build dependency.
Bug: 37360341
Test: checkbuild
Change-Id: I3cc198e25e3b4cfb7c0796246f6b3c4a7733e828
2017-04-17 18:04:48 +00:00
Andrew Scull
1b67465918
Merge "Service for OEM lock management." into oc-dev am: e52a1bfede
...
am: d4be031c76
Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
2017-04-14 18:01:24 +00:00
Andrew Scull
e52a1bfede
Merge "Service for OEM lock management." into oc-dev
2017-04-14 11:31:06 +00:00
Andreas Huber
f13eb2e0c7
Changed the naming scheme for Treble java libraries (both static and dynamic)
...
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java
Bug: 37207894
Test: make
Change-Id: Ica91a6813956f4ea99001c5f427be94865e48fde
Merged-In: I2d8912dc752f904188457c3e6dac10da1afd287a
2017-04-13 15:21:31 -07:00
Andreas Huber
4baa03b3c0
Changed the naming scheme for Treble java libraries (both static and dynamic)
...
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java
Bug: 37207894
Test: make
Change-Id: I2d8912dc752f904188457c3e6dac10da1afd287a
2017-04-13 14:27:10 -07:00
Tomasz Wasilczyk
c06e2c68d7
Merge "Fix makefile warning."
2017-04-12 16:02:27 +00:00
Tomasz Wasilczyk
5fccceb2c5
Merge "Initial implementation of Java-based broadcast radio service."
2017-04-12 14:58:41 +00:00
Tomasz Wasilczyk
7749b0fa20
Fix makefile warning.
...
Test: it builds.
Bug: b/37159108
Change-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
2017-04-11 11:06:34 -07:00
Svet Ganov
ffa27feeb4
Merge "Move API for disabling an autofill service to the manager" into oc-dev am: 7a6df3b777
...
am: de369349a0
Change-Id: I2d48598f8e685591a88882aa1ba81a4e65268e3b
2017-04-11 06:26:32 +00:00
Svet Ganov
f20a037ba2
Move API for disabling an autofill service to the manager
...
Test: the topic has a CTS test
bug:37170723
Change-Id: I2be18968ea8df0fd3fb070fe2efc3e811b0e5a76
2017-04-10 17:43:44 -07:00
Tomasz Wasilczyk
347192e0da
Initial implementation of Java-based broadcast radio service.
...
It provides only limited amount of service, without actual interaction
with HAL.
Added config.enable_java_radio switch to use Java-based service instead
of native. Added FEATURE_RADIO to PackageManager.
Bug: b/36863239
Test: Instrumentation, manual (Kitchen Sink)
Change-Id: I01139d326893c0a437c60cc35d6e5b005da35231
2017-04-10 15:20:50 -07:00
Kang Li
38a6da6473
Add a service to rank apps for ResolverActivity.
...
bug: 36952725,30982298
Test: used PTP before and after this fix.
Change-Id: I5b249af2dd0d9fe32d1e524e8d2675c863e92b5b
2017-04-06 18:08:14 +00:00
Kang Li
bbced1c3d4
Add a service to rank apps for ResolverActivity.
...
bug: 36952725,30982298
Test: used PTP before and after this fix.
Change-Id: I5b249af2dd0d9fe32d1e524e8d2675c863e92b5b
2017-04-05 18:53:07 -07:00
Nathan Harold
b077f6abd3
Merge changes from topic 'ipsec-svc-pick' into oc-dev
...
* changes:
Fix Log Traces for IpSecService
SystemServer: fix StartIpSecService trace and log
Add Initial IPsec APIs to IpSecService
IpSecManager and IpSecTransform API Cleanup
Change reserveSecurityParameterIndex() to take a remoteAddress
Add a Skeleton IpSecService
2017-04-06 01:34:37 +00:00
Kang Li
6a2dd54502
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev am: b24399547c
...
am: e9b280bbec
Change-Id: I84ac856c1838184e2ce819e5f637f2f97cdacbf6
2017-04-05 20:02:37 +00:00
Kang Li
e9b280bbec
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
...
am: b24399547c
Change-Id: I45e96d0b5e88eb280e6dbc5981e6a6a7f1a4b6e2
2017-04-05 19:57:08 +00:00
Kang Li
b24399547c
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
2017-04-05 19:50:10 +00:00
Kang Li
c88749fb5a
Revert "Add a service to rank apps for ResolverActivity."
...
This reverts commit 90370e0b24 .
b: 36952725
Change-Id: Ifa8f182c707cdbbc989b1f61630f7a8fa856d32d
2017-04-05 19:44:02 +00:00
Nathan Harold
cbb58ecc86
Add a Skeleton IpSecService
...
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server
Bug: 30984788
Test: b/34812052, b/34811227
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
(cherry picked from commit 28084d89ec )
2017-04-05 10:23:27 -07:00
Kang Li
8b0979666a
Merge "Add a service to rank apps for ResolverActivity." into oc-dev
...
am: 6df90fa53b
Change-Id: I667b1f9d07305d58f921280f8b8fe9ede0aeea1e
2017-04-04 17:51:03 +00:00
Kang Li
6df90fa53b
Merge "Add a service to rank apps for ResolverActivity." into oc-dev
2017-04-04 17:42:32 +00:00
Chris Craik
5d2e064ebf
Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev am: eabb5621dd
...
am: f497ca5a2e
Change-Id: I0a7bf55e5614b5b8f380332c2cd43d7d14df4e66
2017-04-04 17:35:53 +00:00
Chris Craik
f497ca5a2e
Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev
...
am: eabb5621dd
Change-Id: Ie8e941bc49639d0841d6955c268069d95d450e38
2017-04-04 17:25:05 +00:00
Chris Craik
eabb5621dd
Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev
2017-04-04 17:16:43 +00:00
Seigo Nonaka
c802751704
Merge "Reorganize font enumeration API." into oc-dev am: 2ac9698271
...
am: de5fa6b3d8
Change-Id: I72a02f3f681b3b5f82cffc317fe0668e842464fe
2017-04-04 17:04:40 +00:00
Seigo Nonaka
de5fa6b3d8
Merge "Reorganize font enumeration API." into oc-dev
...
am: 2ac9698271
Change-Id: Ie9bdcdb8d5997db421b783475e1058027cc4bb6f
2017-04-04 16:56:29 +00:00
TreeHugger Robot
2ac9698271
Merge "Reorganize font enumeration API." into oc-dev
2017-04-04 16:49:56 +00:00
Kang Li
90370e0b24
Add a service to rank apps for ResolverActivity.
...
bug: 30982298
Test: manual - shared images in Camera, texts in Messenger, and webpages
in Chrome.
Change-Id: If335c269ca54145839ad8fd4b3f9b93a74b550f8
(cherry picked from commit 35b9e30155 )
2017-04-03 23:44:59 +00:00
Chris Craik
817b494739
Revert "Switch libplatformproto to sharedlib"
...
Bug:36847782
This reverts commit e5549d414c .
Change-Id: I38f1c501b7e40be11ba5f0a7a50651e0c3e41fc5
2017-04-03 21:46:44 +00:00
Seigo Nonaka
ff55115121
Reorganize font enumeration API.
...
This CL cleans up APIs around font variation settings.
- Remove FontConfig and FontManager public API.
- Remove FontManagerService from system service.
- Extract inner class FontConfig.Axis as top-level class FontVariationAxis.
This is used by Typeface.Builder public API to create new Typeface.
- Introduce and expose FontVariationAxis utility functions from/to string.
- Throws if the invalid font variation settings is passed.
Test: android.text.cts.FontVariationAxisTest passes
Test: android.graphics.cts.TypefaceTest passes
Test: android.graphics.cts.PaintTest passes
Change-Id: I9ccafe7a53935960566243e2856e166878ca59ae
2017-04-03 13:55:07 -07:00
Makoto Onuki
82a67cad95
Merge "Persistent connection to DO/PO service." into oc-dev am: dcc792a13f
...
am: 24e1ad4001
Change-Id: Ia90400628ca9313f7ec2326a7c0967fe01e1cc6e
2017-04-03 20:49:51 +00:00
Makoto Onuki
24e1ad4001
Merge "Persistent connection to DO/PO service." into oc-dev
...
am: dcc792a13f
Change-Id: I05bb97b2708cab722e5dfa2807ac24f1869bb245
2017-04-03 20:44:25 +00:00
TreeHugger Robot
dcc792a13f
Merge "Persistent connection to DO/PO service." into oc-dev
2017-04-03 20:35:18 +00:00