Commit Graph

1770 Commits

Author SHA1 Message Date
TreeHugger Robot
e08dcaeda7 Merge "Add task for API diffs" 2017-08-14 22:27:59 +00:00
Jakub Pawlowski
06ae9c665b Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.

Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
2017-08-08 19:04:13 +00:00
Todd Kennedy
b6ff3774fc Merge "Add native bindings for getNamesForUids" into oc-mr1-dev am: 8c18e1faf8
am: 3ff3e75fb2

Change-Id: I21a656cd60896a73dd0ca07b47f09af92f874dff
2017-08-08 16:23:09 +00:00
Todd Kennedy
3ff3e75fb2 Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
am: 8c18e1faf8

Change-Id: If0d1dc60455c961215454a5b2edcb59c0097add4
2017-08-08 16:06:17 +00:00
TreeHugger Robot
8c18e1faf8 Merge "Add native bindings for getNamesForUids" into oc-mr1-dev 2017-08-08 15:58:41 +00:00
Todd Poynor
589ce7dfc5 Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
am: 590f519f24

Change-Id: I1397add21609288770d46f21d8a23cf55e6e9a75
2017-08-08 01:23:35 +00:00
Todd Poynor
875e5c7451 thermalservice: Add ThermalService java interfaces
Binder service ThermalService broadcasts thermal events to registered
listeners.

Test: manual: marlin with modified thermal-engine.conf and temporary
      java thermal event listener
Bug: 30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
(cherry picked from commit dd05582eab)
2017-08-07 23:08:36 +00:00
Jeff Sharkey
1fb3a312e7 Merge "Fix broken javadocs." into oc-mr1-dev am: b79eb54d36
am: 1ad38fe278

Change-Id: I21266d20be036196dbeddb9c4366d641ab1b68a8
2017-08-06 17:00:09 +00:00
Jeff Sharkey
1ad38fe278 Merge "Fix broken javadocs." into oc-mr1-dev
am: b79eb54d36

Change-Id: I283e3914833b01969308afbd2fad1889e0497338
2017-08-06 16:45:10 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
Todd Kennedy
ad192a392b Add native bindings for getNamesForUids
A new API [getNamesForUids] was recently added to the PackageManager
and this API needs to be accessible to native code. However, there
were two constraints:
1) Instead of hand-rolling the binder, we wanted to auto generate
the bindings directly from the AIDL compiler.
2) We didn't want to expose/annotate all 180+ PackageManager APIs
when only a single API is needed.
So, we chose to create a parallel API that can be used explicitly
for native bindings without exposing the entirety of the
PackageManager.

Bug: 62805090
Test: Manual
Test: Create a native application that calls into the new service
Test: See the call works and data and returned
Change-Id: Ia571ab1607c6c88fef44eb0de6a313a28906c732
2017-08-04 13:36:37 -07:00
Alan Viverette
6b7354c61e Add task for API diffs
Test: make api-diff
Change-Id: I4ddd0f59c41f1d435299bda11f98828fe98920a3
2017-08-04 10:18:09 -04:00
Steven Moreland
eeb0153e82 Remove dependency on CalHas.mk.
Now that we can, include dependency on hal
directly.

Test: java links
Test: wip/todo
Change-Id: I45f8c5befab80add7c80cf59dc5c5c56519d295d
Fixes: 64294630
2017-08-03 12:35:08 -07:00
Sundong Ahn
bae17bc4e5 Merge "Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp am: a4fb234a4c" into oc-mr1-dev-plus-aosp
am: 577653628b

Change-Id: Iea878b7dd7873e5c818afd34b0a035b38cc44db9
2017-08-02 17:43:02 +00:00
Sundong Ahn
014ca608c7 Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp
am: a4fb234a4c

Change-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25
2017-08-02 17:27:38 +00:00
Sundong Ahn
30538850f2 Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7
am: 2785be7572

Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22
2017-08-02 17:14:55 +00:00
Sundong Ahn
2785be7572 Merge "Add hwbinder library" am: 49e2a9a612
am: 811027ede7

Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
2017-08-02 17:05:56 +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
Andrew Solovay
acb195f00d Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b am: 51f65bbcbf am: 1dbd4a48c5
am: 5f2086fc7d

Change-Id: I3bb52b18a0ad8c8a88eb8faf43ec83c4f33c998c
2017-07-28 22:54:34 +00:00
Andrew Solovay
5f2086fc7d Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b am: 51f65bbcbf
am: 1dbd4a48c5

Change-Id: I8ae0c12093620fd14fe60e5b7f653df4cdb2db67
2017-07-28 22:00:35 +00:00
Andrew Solovay
76044cddc5 Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b
am: 51f65bbcbf

Change-Id: I17386cc10e591e60442eeeba7e4dec42c9b4bd54
2017-07-28 21:50:15 +00:00
Andrew Solovay
1dbd4a48c5 Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b
am: 51f65bbcbf

Change-Id: If54feb86d47552ea89da661c7769a25efe669237
2017-07-28 20:30:26 +00:00
Andrew Solovay
557b11bac1 Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I2936fc48db92ad5846b5c72549d265ce4180686d
2017-07-28 20:18:34 +00:00
Andrew Solovay
51f65bbcbf Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I57763d6980b66ef288788153d275cf196fbd510a
2017-07-28 20:18:29 +00:00
Todd Poynor
dd05582eab thermalservice: Add ThermalService java interfaces
Binder service ThermalService broadcasts thermal events to registered
listeners.

Test: manual: marlin with modified thermal-engine.conf and temporary
      java thermal event listener
Bug: 30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
2017-07-28 02:22:42 +00:00
Dirk Dougherty
fdad0ba193 Cherry-pick from master Doc change: Add API 26 to @since list
Add API 26 to @since list and turn off preview watermarking.
Fix has been successfully submitted in master and affects doc files
only.

Bug: 62087404
Bug: 64123587
Test: make ds-docs

Original change-Id: Idcf84882a1a1fe0864ee6ff3d0af6cd857c73a06

Change-Id: I28700ad15d931256d9dfc1016df546bd2f0e718f
2017-07-27 15:00:46 -07:00
Love Khanna
b54567810f NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-21 17:05:47 -07:00
Love Khanna
276f9fe619 NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-21 17:01:28 -07:00
Andrii Kulian
d313469e28 DO NOT MERGE VirtualDisplay wrapper with input forwarding
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.

Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.

Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
  app, then it must be embeddable and launcher must have
  permission to embed.

Bug: 63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
2017-07-21 13:14:37 -07:00
Andrii Kulian
94e82d9b0e DO NOT MERGE ActivityView be gone!
This hidden functionality is no longer support/needed since
we now have multi-window/display. A new view group class
will be added later that uses multi-window to support remaining
functionality of this class.

Test: go/wm-smoke
Change-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4
2017-07-21 13:14:19 -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
Love Khanna
fae8a90d54 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1d3929d46a
am: d206755f74

Change-Id: I58983c51b05931da60cca762f4a5aeff974264a1
2017-07-21 05:21:07 +00:00
Love Khanna
d206755f74 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17
am: 1d3929d46a

Change-Id: I024c1929515f514746c9e74369a259d231036b9b
2017-07-21 05:14:37 +00:00
Love Khanna
1d3929d46a Merge "NFC DTA Integration" into oc-dr1-dev
am: f8469ccf17

Change-Id: I661800e26a8dc66b2a7a7676e0df11d928272f89
2017-07-21 05:09:02 +00:00
Love Khanna
1e43a74a47 Merge "NFC DTA Integration" into oc-dr1-dev
am: f8469ccf17

Change-Id: I8acca990e6191360fc3f4f9c668f74d7a06d6a52
2017-07-21 05:08:25 +00:00
Love Khanna
755a8fa44e NFC DTA Integration
Bug: 63903843
Test: compiles.
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-20 22:15:39 +00:00
Andrii Kulian
8d5a505d6a Merge changes from topic 'activity_view_v2'
* changes:
  VirtualDisplay wrapper with input forwarding
  ActivityView be gone!
2017-07-20 15:48:26 +00:00
Robert Greenwalt
bfa50d4852 Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9 am: 12286b2608
am: 7acfec846b

Change-Id: If16b8c107d39c5791ea8c3b3b28afd4f37500b44
2017-07-20 00:49:58 +00: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
Andrii Kulian
ed76e7473f VirtualDisplay wrapper with input forwarding
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.

Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.

Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
  app, then it must be embeddable and launcher must have
  permission to embed.

Bug: 63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
2017-07-19 14:52:06 -07:00
Lorenzo Colitti
8228eb3446 resolve merge conflicts of a1d67fb38e 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 ef7b2a13ce)

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
Tomasz Wasilczyk
38d9ee4cd6 Merge "Implement ProgramSelector for font-end Java APIs." 2017-07-18 15:36:22 +00:00
Tomasz Wasilczyk
8cfb0e81fd Implement ProgramSelector for font-end Java APIs.
Bug: b/32621193
Test: instrumentalization
Change-Id: Ibb9841fed76ef3568c2e36ca28ea31addf9175f1
2017-07-17 16:23:05 -07:00
Andrii Kulian
b1cdb10e7c ActivityView be gone!
This hidden functionality is no longer support/needed since
we now have multi-window/display. A new view group class
will be added later that uses multi-window to support remaining
functionality of this class.

Test: go/wm-smoke
Change-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4
2017-07-14 23:27:12 -07:00
Lorenzo Colitti
f7a008ff69 Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev am: 3756636ad6
am: 041111ff7e

Change-Id: I538f7faef85bbb13499dec2125e0f82b3175396f
2017-07-14 01:06:56 +00:00