1657 Commits

Author SHA1 Message Date
Jakub Pawlowski
3b38eaa3c2 resolve merge conflicts of 15658662fdde to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08
2017-08-09 13:03:35 +00:00
Sundong Ahn
811027ede7 Merge "Add hwbinder library"
am: 49e2a9a612

Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
2017-08-02 16:57:50 +00:00
Sundong Ahn
28cc6e88fd Add hwbinder library
HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.

Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.

Bug: 35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29
2017-08-01 11:26:18 +09:00
Love Khanna
b54567810f NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-21 17:05:47 -07:00
Treehugger Robot
a42c8a1667 Merge "NFC DTA Integration" 2017-07-21 17:38:53 +00:00
Love Khanna
2dc772165b NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-21 16:23: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
Lorenzo Colitti
8228eb3446 resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master
Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
2017-07-19 07:35:31 +09:00
Lorenzo Colitti
07f1304cfe Allow more than one source of tethering statistics.
Currently, netd is the only source of tethering statistics.
In order to support multiple sources, define a new
ITetheringStatsProvider interface that can be registered with
NetworkManagmentService. Convert the existing code into the
first ITetheringStatsProvider.

(cherry picked from commit ef7b2a13ce4c34950b52de27dcf65b74388d7b3d)

Bug: 29337859
Bug: 32163131
Test: builds, boots
Test: tethering stats continue to be collected
Change-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Merged-In: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
2017-07-19 00:54:54 +09:00
Hall Liu
d45a007222 Merge "Implement getDownloadStatus and add permission"
am: 2fa880d016

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959
2017-07-12 23:27:49 +00:00
Hall Liu
55f557dc7c Implement getDownloadStatus and add permission
- Implement getDownloadStatus in the manager
- Remove DownloadStatus and add constants in its place to reflect the
status of a single file
- Add ACT_AS_EMBMS_MIDDLEWARE permission

Change-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87
2017-07-06 13:40:09 -07:00
Jordan Liu
b699e98285 Merge "Add IApnSourceService.aidl" am: 1d5d409f6f
am: 7b78a176a9

Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a
2017-06-09 19:04:48 +00:00
Jordan Liu
e5c7420f45 Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.

Bug: 37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
2017-06-08 15:56:38 -07:00
Jeff Sharkey
67cb5f5210 Merge "Give Doclava our manifest; more permission docs." into oc-dev
am: 65d4cbba37

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
2017-06-06 15:28:26 +00:00
Jeff Sharkey
bfc4fcde9f Give Doclava our manifest; more permission docs.
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.

Also document more @SystemApi permissions.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
2017-06-05 17:38:19 -06:00
Dan Willemsen
bb354909bd Merge "Fix makefile warning." am: f523227a6e am: 9e317f8743
am: 1cb063d3ed

Change-Id: I83e952804b47ad50b1c8c9125ef36772f6571d69
2017-05-23 17:25:09 +00:00
Tomasz Wasilczyk
191330e4a1 Fix makefile warning.
Test: it builds.
Bug: b/37159108
Change-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Merged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
2017-05-22 22:39:15 -07:00
Hall Liu
4b1d35035d Merge "startStreaming for MBMS apis" am: 4b3c44be55 am: 0a4740ec5c
am: 624290d3c8

Change-Id: I6cddee57736b27dfcf88537f4e602d4bf6bc81aa
2017-05-16 20:05:41 +00:00
Hall Liu
fb1ee0ebb2 startStreaming for MBMS apis
Clean up MBMS APIs a bit and make things functional for the
startStreaming/getPlaybackUri APIs.

Test: testapps
Change-Id: I141a4114cc912b98ae22aefb760346061e286f1a
2017-05-15 16:48:52 -07:00
Jeff Sharkey
e9e899f49b Merge "Start building SystemApi docs again; exact output." into oc-dev
am: ab3c811678

Change-Id: I1b45a67f2bc3e76d09f29dc59bc9a6c9dcd3d3d5
2017-05-10 16:10:45 +00:00
Jeff Sharkey
ab3c811678 Merge "Start building SystemApi docs again; exact output." into oc-dev 2017-05-10 15:05:55 +00:00
Jeff Sharkey
05461c0a46 Start building SystemApi docs again; exact output.
Now that we've fixed the docs build we can enable it again.  Also
start using the new "-exactApi" feature to get a file with exactly
the annotated APIs instead of a giant superset.  (This makes it
easier to compare diffs between releases.)

Test: make update-api && make -j32 online-system-api-sdk-docs
Bug: 38146029
Change-Id: Ib6d5d931f71ac4f50bf3223c25b50ed5765406a3
2017-05-09 19:02:05 -06:00
Abodunrinwa Toki
41564af248 Merge "Remove redundant TextClassificationService" into oc-dev
am: 104590844e

Change-Id: Ib2881e478819eaff8910f5a0982e4f048e4bb7c1
2017-05-09 16:59:38 +00:00
Abodunrinwa Toki
3de110bbb7 Remove redundant TextClassificationService
Text classification is now being done entirely in the app's proccess.
See android.view.textclassifier.TextClassificationManager
Reverts Ic428d00f291e268211866b3fc6b7acbc3eb04e1e

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Fixes: 36852122
Change-Id: Iffff3ab6e7d3b761576eb6bdcd5032db34b7a1b2
2017-05-09 13:51:03 +01:00
Colin Cross
2bcc40bde1 Convert libplatfomprotos to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I0b45697d1042cb1647f2609b2257444dede84d2a
(cherry picked from commit aa0d4355d78a94b2c6557983d1fa9aa6c529294c)
2017-05-04 17:01:47 +00:00
Neil Fuller
167b047385 Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.

This forms the basis of client and system server code to
support time zone updates.

Tests can be run with:

make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
    -w com.android.frameworks.coretests \
    "com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

This contains a cherry-pick / conflict resolution of
commit bede17c216815a849be0c43d5ce7daaf750a9fac after an automerger skip.
(cherry picked from commit bede17c216815a849be0c43d5ce7daaf750a9fac)

Bug: 31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
2017-05-04 15:58:40 +01:00
Neil Fuller
cfe0c2f1ec Merge "Time zone update API classes" 2017-05-04 13:51:39 +00:00
Neil Fuller
bede17c216 Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.

This forms the basis of client and system server code to
support time zone updates.

Tests can be run with:

make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
    -w com.android.frameworks.coretests \
    "com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

Bug: 31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
2017-05-04 12:32:53 +01:00
Hall Liu
5184e5ded2 Merge "eMBMS API update" am: 99b21ccb34 am: 6b4841d116
am: cfb792830c

Change-Id: I4d227eeae02910f4be020b3e9abf3ec5decc168d
2017-04-28 22:38:27 +00:00
Hall Liu
563e150c2d eMBMS API update
Brings eMBMS APIs into alignment with the architecture doc.
All APIs are hidden for now.

Test: builds
Change-Id: I6e692bd363f998d1cd8f80faa72bde71ffe8fd2e
2017-04-27 19:43:11 -07:00
Jakub Pawlowski
5df218c5c4 Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
* changes:
  Bluetooth: expand comments on new PHY constants
  Bluetooth: document status value in PHY read/update
  Bluetooth: Add handler parameter to connectGatt
  Get rid of the IAdvertiserCallabck
2017-04-26 08:16:53 +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
Jakub Pawlowski
d2ac8b94e7 Get rid of the IAdvertiserCallabck
Bug: 30622771
Test: none
Change-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971
(cherry picked from commit 89e10d3eb4a4728ffdb5a5eba76d772d28bcb855)
2017-04-25 13:00:25 -07: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
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
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
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
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
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
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
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
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 90370e0b2497deba9382ab7ff1539b6849df8139.

b: 36952725

Change-Id: Ifa8f182c707cdbbc989b1f61630f7a8fa856d32d
2017-04-05 19:44:02 +00:00