Jakub Pawlowski
4eba68c81f
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)" am: 15658662fd -s ours
...
am: 2bcb9ec481
2017-08-09 07:25:20 +00:00
Jakub Pawlowski
2bcb9ec481
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
...
am: 15658662fd
2017-08-09 07:13:32 +00:00
Jakub Pawlowski
15658662fd
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
2017-08-08 22:39:31 +00:00
Jakub Pawlowski
6732625aa0
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
Merged-In: I9a6db8832c9ec3215c648e325d67278832ef22cc
(cherry picked from commit 06ae9c665b
2017-08-08 12:38:37 -07:00
Takashi Furukawa
a6e588fffc
Merge "Add null check for Wi-Fi command" am: 43ee2ac140
...
am: 51e24de109
2017-08-08 18:20:59 +00:00
Takashi Furukawa
51e24de109
Merge "Add null check for Wi-Fi command"
...
am: 43ee2ac140
2017-08-08 18:14:53 +00:00
Treehugger Robot
43ee2ac140
Merge "Add null check for Wi-Fi command"
2017-08-08 18:03:14 +00:00
Felipe Leme
04a8660851
Clarifies autofill lifecycle.
...
am: 744976e298
2017-08-08 17:37:13 +00:00
Calin Juravle
4740e015b9
Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d
...
am: 8a9e43f1bf
2017-08-08 17:21:10 +00:00
Calin Juravle
8a9e43f1bf
Merge "Update DexLoadReporter to comply with the new reporting API"
...
am: 89d087886d
2017-08-08 17:13:06 +00:00
Calin Juravle
89d087886d
Merge "Update DexLoadReporter to comply with the new reporting API"
2017-08-08 17:03:21 +00:00
Hugo Benichi
082a9fa173
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am: c06dbc114f -s ours
...
am: 607f74b317
2017-08-08 08:48:56 +00:00
Hugo Benichi
607f74b317
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
...
am: c06dbc114f
2017-08-08 08:40:40 +00:00
Treehugger Robot
c06dbc114f
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
2017-08-08 08:30:03 +00:00
Hugo Benichi
db554dfdfa
Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b
...
am: a22fbf4534
2017-08-08 07:40:02 +00:00
Hugo Benichi
ffcc739a39
Merge "Fix flaky IpPrefixTest." am: 2cbce2cb27 -s ours
...
am: 7d752a872d
2017-08-08 07:34:42 +00:00
Hugo Benichi
a22fbf4534
Merge "Connectivity OWNERS: let owners modify Android.mk"
...
am: 05be68698b
2017-08-08 07:34:39 +00:00
Hugo Benichi
7d752a872d
Merge "Fix flaky IpPrefixTest."
...
am: 2cbce2cb27
2017-08-08 07:28:32 +00:00
Hugo Benichi
847647b96b
Merge "Add OWNERS to com.android.server.net" am: 0a00151bd1
...
am: 24f5d8f866
2017-08-08 07:21:41 +00:00
Hugo Benichi
05be68698b
Merge "Connectivity OWNERS: let owners modify Android.mk"
2017-08-08 07:20:07 +00:00
Treehugger Robot
2cbce2cb27
Merge "Fix flaky IpPrefixTest."
2017-08-08 07:16:48 +00:00
Hugo Benichi
24f5d8f866
Merge "Add OWNERS to com.android.server.net"
...
am: 0a00151bd1
2017-08-08 07:16:12 +00:00
Treehugger Robot
0a00151bd1
Merge "Add OWNERS to com.android.server.net"
2017-08-08 07:07:25 +00:00
Hugo Benichi
4478840931
DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies
...
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.
Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
(cherry pick from commit 99e8ab6e46
2017-08-08 16:06:54 +09:00
Hugo Benichi
e4d461c0c8
Add OWNERS to com.android.server.net
...
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
2017-08-08 16:06:53 +09:00
Hugo Benichi
41494c10e6
Fix flaky IpPrefixTest.
...
Test: IpPrefixTest passes
Bug: 32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
(cherry pick from commit 32c6870403
2017-08-08 14:54:08 +09:00
Hugo Benichi
afd2346bcc
Connectivity OWNERS: let owners modify Android.mk
...
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.
This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.
Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
2017-08-08 10:46:57 +09:00
Felipe Leme
744976e298
Clarifies autofill lifecycle.
...
Test: m update-api
Bug: 64125551
Bug: 64114048
Change-Id: I17c5bc2e2e64fa27e877301dbcb983ac8497209e
2017-08-07 17:22:50 -07:00
Colin Cross
a5538805d9
Merge "Use class retention for VisibleForTesting annotations" am: 5724841581
...
am: 94d5456d0e
2017-08-07 19:44:57 +00:00
Colin Cross
94d5456d0e
Merge "Use class retention for VisibleForTesting annotations"
...
am: 5724841581
2017-08-07 19:32:21 +00:00
Treehugger Robot
5724841581
Merge "Use class retention for VisibleForTesting annotations"
2017-08-07 19:17:33 +00:00
Colin Cross
5be3cbad27
Use class retention for VisibleForTesting annotations
...
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests. The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation. When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.
Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.
Bug: 64365384
Test: m -j MtpDocumentsProvider &&
javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot
Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit 8e846143dd
2017-08-07 11:07:15 -07:00
Bill Yi
9faa483116
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 4e9a4d81d2
2017-08-07 05:33:46 +00:00
Bill Yi
5c0301ef95
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: c733eac940
2017-08-07 05:31:31 +00:00
Bill Yi
2c97d049c2
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 06a47f450a
2017-08-07 05:29:40 +00:00
Bill Yi
bbf4ba81ac
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: e4f2ebbd25
2017-08-07 05:27:41 +00:00
Bill Yi
fdcf523f18
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 1d14f1ada0
2017-08-07 05:25:46 +00:00
Bill Yi
8ca1114359
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 73dfb82d48
2017-08-07 05:21:38 +00:00
Bill Yi
0a8d8def4d
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 68203dee07
2017-08-07 05:19:37 +00:00
Bill Yi
db3308c738
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 3af6f0a522
2017-08-07 05:17:33 +00:00
Bill Yi
e68c2dfce9
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: ee4e599681
2017-08-07 05:15:31 +00:00
TreeHugger Robot
4e9a4d81d2
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-08-07 05:12:45 +00:00
TreeHugger Robot
c733eac940
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-08-07 05:12:04 +00:00
TreeHugger Robot
06a47f450a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-08-07 05:09:59 +00:00
Bill Yi
0f61118df4
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: fcec79296d
2017-08-07 05:09:49 +00:00
TreeHugger Robot
e4f2ebbd25
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-08-07 05:08:40 +00:00
TreeHugger Robot
1d14f1ada0
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-08-07 05:08:08 +00:00
TreeHugger Robot
73dfb82d48
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-08-07 05:07:30 +00:00
Bill Yi
285ab26bf5
Import translations. DO NOT MERGE
...
am: 4851eef8a4
2017-08-07 05:07:27 +00:00
TreeHugger Robot
68203dee07
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-08-07 05:05:38 +00:00
