OSDN Git Service
Bill Yi [Wed, 26 Jul 2017 23:44:16 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours
am:
995029b529 -s ours
Change-Id: Iea953c1a17f18528e1c3ae5b3663419745e88b79
Bill Yi [Wed, 26 Jul 2017 23:38:01 +0000 (23:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours
am:
aec51f497c -s ours
Change-Id: I2f855bb13f287547ab5f42c05dada215465d0e5c
Bill Yi [Wed, 26 Jul 2017 23:34:30 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9724569903 -s ours
am:
18b818e2dd -s ours
Change-Id: Ia30698cfb205b69d5d954ec4f9405fa228aa572e
Bill Yi [Wed, 26 Jul 2017 23:09:07 +0000 (23:09 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev am:
cd955ca6e5 -s ours
am:
f66ddc099a -s ours
Change-Id: Ia6630c6dd3cf9daf78fd3f07ebdc7515c548a3bd
Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours
am:
6f24c015ef -s ours
Change-Id: I1926ae43168fa88c14390130282d1517091c7129
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3875d1a103 -s ours
Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d
Bill Yi [Wed, 26 Jul 2017 22:49:37 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c2b08ca602 -s ours
Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2
Bill Yi [Wed, 26 Jul 2017 22:46:01 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours
am:
cccb304acf -s ours
Change-Id: Ic9fa84f60261dd11093f38c3e02845dc3da2a3a2
Bill Yi [Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9724569903 -s ours
Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42
Bill Yi [Wed, 26 Jul 2017 22:40:44 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours
am:
611a6ffe29 -s ours
Change-Id: I4c8c61a56288b7b4fdad4ccca07c51c0a8cfb38c
Bill Yi [Wed, 26 Jul 2017 22:39:47 +0000 (22:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
am:
cd955ca6e5 -s ours
Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b
Bill Yi [Wed, 26 Jul 2017 22:37:25 +0000 (22:37 +0000)]
Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours
am:
120c3e9874 -s ours
Change-Id: If6b7cc81b779c33a83506ccb0da87b7a643dd177
Bill Yi [Wed, 26 Jul 2017 22:35:23 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
am:
3bcdbff889 -s ours
Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878
Bill Yi [Wed, 26 Jul 2017 22:28:59 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a1bde91384 -s ours
Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c
Bill Yi [Wed, 26 Jul 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9bc30ce545 -s ours
Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935
Bill Yi [Wed, 26 Jul 2017 22:21:36 +0000 (22:21 +0000)]
Import translations. DO NOT MERGE
am:
495d4ce1b9 -s ours
Change-Id: I1294580d3e9485f0367aca366054336d0dc3b9ed
TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 22:04:23 +0000 (22:04 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 22:01:57 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fbfd283125 -s ours
Change-Id: I39f298c62ae870a0a764a1cb60d766e8e03f692b
Android Build Merger (Role) [Wed, 26 Jul 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 21:58:32 +0000 (21:58 +0000)]
Import translations. DO NOT MERGE
am:
69d0838208 -s ours
Change-Id: I25641bf4fbc60d8e40887a43965a602000bc8377
TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 18:03:33 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I228aaf428e6298a9077e8f277c3e6e26b5ebd7a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13f52e0726334b4ff47a780e3d5c41074d96aada
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:01:07 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8b8dd3e35096ba23f1dd7cc01beba7b392167591
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:00:00 +0000 (11:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfe4076b754c857472076b3aa9d9fd0b491e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:57:20 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9be29c557742c6c1d233376f49088bcb3309bfb3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:23:59 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a677eabfe97553a7bddecfa88064d5e4edd37b6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 08:11:42 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a7f60741ae -s ours
Change-Id: If5dcfdf1c84371d86aeb37df131d10605808ad61
TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 26 Jul 2017 08:02:03 +0000 (08:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b4e8cad186 -s ours
Change-Id: I5c909bf0c13581379f08f21394c1c3221944c93e
Bill Yi [Wed, 26 Jul 2017 07:59:43 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am:
7c2b27f26f -s ours
Change-Id: I229f14aa24ced413b14247e372f6d94974fba315
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie81e9b6438034399af10f964876f14cb08b8ceb7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd1d218d134f9871650b17254741c4a0b40a4f0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f6bf766d9d5d91f8b885e4ecc0878cacde1668f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
George Burgess IV [Wed, 26 Jul 2017 00:37:03 +0000 (00:37 +0000)]
Merge "Silence a memory leak warning from the static analyzer" am:
f44ebf5fcb
am:
20674ac1eb
Change-Id: I0f0efff718ae96adcc30ef6554aaccc96da66b0a
George Burgess IV [Wed, 26 Jul 2017 00:26:12 +0000 (00:26 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
am:
f44ebf5fcb
Change-Id: Ic0b97fb0689b4d322aa6ed25fe55ec192bff07a5
Treehugger Robot [Wed, 26 Jul 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
George Burgess IV [Tue, 25 Jul 2017 21:22:07 +0000 (14:22 -0700)]
Silence a memory leak warning from the static analyzer
The analyzer assumes that the given `put` operation may fail. This
shouldn't be the case, so mark it with a LOG_ALWAYS_FATAL_IF. Doing so
silences a warning about potential memory leaks originating from
TessellationCache::getRoundRect.
Bug:
27101951
Test: mma. Warning is gone.
Change-Id: I3adeacd6c2c9c03caecd989e2a1267c51e8ef905
Carlos Vinueza [Tue, 25 Jul 2017 16:35:11 +0000 (16:35 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation" am:
d00de318f9
am:
b7e104d0a3
Change-Id: I94bc7fa7f68eefd8eae5d33689cd9d6983669df7
Carlos Vinueza [Tue, 25 Jul 2017 16:27:10 +0000 (16:27 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"
am:
d00de318f9
Change-Id: Ib17b53a72e737a7b584c65b63c89bd7524c1a2c4
Treehugger Robot [Tue, 25 Jul 2017 16:12:23 +0000 (16:12 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"
Neil Fuller [Tue, 25 Jul 2017 15:01:12 +0000 (15:01 +0000)]
Merge "Remove TODO related to WakeLocks" am:
12d08bf9a0
am:
069bb850d8
Change-Id: Ic57af16f3f3fbbe209e1fc5fd5f13c7c8ad8117d
Neil Fuller [Tue, 25 Jul 2017 14:54:46 +0000 (14:54 +0000)]
Merge "Remove TODO related to WakeLocks"
am:
12d08bf9a0
Change-Id: Id94118a9b687493f6f6879bf6bbe23cfad86dfa9
Treehugger Robot [Tue, 25 Jul 2017 14:42:40 +0000 (14:42 +0000)]
Merge "Remove TODO related to WakeLocks"
Hugo Benichi [Tue, 25 Jul 2017 14:39:40 +0000 (14:39 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests" am:
a9889c94aa
am:
39a707813b
Change-Id: Ie56377ae158d32a3592fd700e93fc827754ecaa3
Hugo Benichi [Tue, 25 Jul 2017 14:33:45 +0000 (14:33 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests"
am:
a9889c94aa
Change-Id: Ic3b145159a4c0430cc248a19b8527af40fa67696
Treehugger Robot [Tue, 25 Jul 2017 13:05:47 +0000 (13:05 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests"
Neil Fuller [Tue, 25 Jul 2017 12:14:32 +0000 (13:14 +0100)]
Remove TODO related to WakeLocks
There's no need to keep a WakeLock in the RulesManager - if
the device goes to sleep it should continue the work when
it wakes up again. All I/O is handled via AtomicFile and should
be robust to corruption, etc. and this reduces the likelihood
of issues caused by sudden sleeps.
Bug:
31008728
Test: make
Change-Id: I3d5076ca7d2f39076f76bdb745cedde214eac21b
Hugo Benichi [Mon, 24 Jul 2017 00:30:52 +0000 (09:30 +0900)]
Bootstrap IpReachabilityMonitor unit tests
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I236029f460dc3631ef9f5d8312dc1c6faf9807df
ludi [Tue, 25 Jul 2017 03:17:24 +0000 (03:17 +0000)]
Merge "Add dump info to IpSecService" am:
ec5fc4872e
am:
3f3c4f6da4
Change-Id: Iaa81bf94573f06dc2dbd00e30df283c0ce7a7a76
ludi [Tue, 25 Jul 2017 03:07:00 +0000 (03:07 +0000)]
Merge "Add dump info to IpSecService"
am:
ec5fc4872e
Change-Id: Idd4c051e4536d32504718fdfd201c7effdeb62e3
Treehugger Robot [Tue, 25 Jul 2017 02:38:47 +0000 (02:38 +0000)]
Merge "Add dump info to IpSecService"
Andreas Gampe [Tue, 25 Jul 2017 00:27:45 +0000 (00:27 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am:
81f66ce5ab
am:
d795bbcdcc
Change-Id: I350d479d030e3b8398975f60b8463343f7bb5e86
Andreas Gampe [Tue, 25 Jul 2017 00:18:19 +0000 (00:18 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
am:
81f66ce5ab
Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237
Treehugger Robot [Tue, 25 Jul 2017 00:06:02 +0000 (00:06 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
ludi [Mon, 22 May 2017 17:52:23 +0000 (10:52 -0700)]
Add dump info to IpSecService
Bug:
38350824
Test: runtest frameworks-net
Change-Id: Ifa11d55e9d337016ad865baada627db3aa8c2db3
Shubham Ajmera [Mon, 24 Jul 2017 22:43:33 +0000 (22:43 +0000)]
Update DexFile#getDexOptNeeded usages to reflect API change
am:
52c8620c19
Change-Id: I31b2aec15ace15e159eaeaafdd55d10767aaca0f
Shubham Ajmera [Mon, 24 Jul 2017 22:21:04 +0000 (15:21 -0700)]
Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug:
36598475
(partially cherry-picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa
Shubham Ajmera [Mon, 24 Jul 2017 20:14:05 +0000 (20:14 +0000)]
Merge "Update DexFile#getDexOptNeeded usages to reflect API change" am:
515e6443aa -s ours
am:
925a08df7c
Change-Id: Iffe8405af9c671c0808e54288319c31d19072f10
Shubham Ajmera [Mon, 24 Jul 2017 20:07:27 +0000 (20:07 +0000)]
Merge "Update DexFile#getDexOptNeeded usages to reflect API change"
am:
515e6443aa -s ours
Change-Id: I5553eaa94705b4dd3f3bde0d5a7a6acb23826f84
Shubham Ajmera [Mon, 24 Jul 2017 19:11:29 +0000 (19:11 +0000)]
Merge "Update DexFile#getDexOptNeeded usages to reflect API change"
Carlos Vinueza [Thu, 20 Jul 2017 23:40:35 +0000 (16:40 -0700)]
Adding 4 standard short codes required by Android Constellation
This set is last minute addition to the whitelist free short code batch
2017 Q2 - Android Partner Engineering
Includes 4 country wide SMS standard short codes required by the
Constellation team.
Test: manual - uploaded modified file onto test device and tested
sending SMS to changed shortcodes to verify behaviour.
Bug:
37355429
Change-Id: Iffad649a74dcc7afd6a3574a92825d309df2d3ba
Signed-off-by: Carlos Vinueza <chinesco@google.com>
Andreas Gampe [Fri, 21 Jul 2017 18:41:00 +0000 (11:41 -0700)]
Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.
Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.
Bug:
63904739
Bug:
63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
Hugo Benichi [Mon, 24 Jul 2017 11:43:12 +0000 (11:43 +0000)]
Merge "CaptivePortalLoginActivity: improve logging" am:
c0a4f5357e
am:
d5174ac63d
Change-Id: Ia8a9105404399901ca633a8f883ffa5be8f9548b
Hugo Benichi [Mon, 24 Jul 2017 11:34:40 +0000 (11:34 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
am:
c0a4f5357e
Change-Id: I475b58f1a6146f0faf4ddf90f44e032ee6c3120f
Treehugger Robot [Mon, 24 Jul 2017 11:21:21 +0000 (11:21 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
Love Khanna [Sat, 22 Jul 2017 00:59:17 +0000 (00:59 +0000)]
NFC DTA Integration
am:
b54567810f -s ours
Change-Id: I0a95d61bcc814a922453ebf024f4675367ec8bf0
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Steven Moreland [Fri, 21 Jul 2017 23:34:17 +0000 (23:34 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148
am:
d37f13603a
Change-Id: Ib0d843954f0a4854b6cea5ef3a4e0ad1ed4f29cb
Steven Moreland [Fri, 21 Jul 2017 23:27:27 +0000 (23:27 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
am:
e8341b6148
Change-Id: I1337a9b40fdf762cc0150983536981f0a163750a
Treehugger Robot [Fri, 21 Jul 2017 23:18:09 +0000 (23:18 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
David Friedman [Fri, 21 Jul 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
am:
e4d0557334
Change-Id: If97a3685c4e55ca006d1876a0378a772bf784c2d
David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
Shubham Ajmera [Wed, 19 Jul 2017 00:12:21 +0000 (17:12 -0700)]
Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug:
36598475
(partially cherry-picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Change-Id: If90690d6234dc8727df2b2fb485f0c8d50970a92
Steven Moreland [Fri, 21 Jul 2017 19:29:54 +0000 (19:29 +0000)]
Revert "Revert "Update for less arguments in hidl toBinder.""
This reverts commit
243bcfda3ac35735a959f8abcc45186aba0af116.
(originally reverted due to merge conflicts)
Bug:
32172906
Test: hidl_test
Change-Id: I70fde3ffe0d2c67390f7152acedd45c39009a134
Hall Liu [Fri, 21 Jul 2017 21:23:36 +0000 (21:23 +0000)]
Merge "Make slight API and doc adjustments" am:
b7e10650d8
am:
14be4e65b2
Change-Id: Ida2487f5be62ea6f4de0668abb830590494c880a
Hall Liu [Fri, 21 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Merge "Make slight API and doc adjustments"
am:
b7e10650d8
Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87
Hall Liu [Fri, 21 Jul 2017 21:09:34 +0000 (21:09 +0000)]
Merge "Make slight API and doc adjustments"
Steven Moreland [Fri, 21 Jul 2017 19:43:34 +0000 (19:43 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder."" am:
79994cb142
am:
16255fda63
Change-Id: I6e295f30bef2de7fe1840da821db7ea4d8ef72ec
Steven Moreland [Fri, 21 Jul 2017 19:28:14 +0000 (19:28 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
am:
79994cb142
Change-Id: I325335a278fc9aebf7957e23089c72665169eeb3
Steven Moreland [Fri, 21 Jul 2017 19:14:24 +0000 (19:14 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
Steven Moreland [Fri, 21 Jul 2017 19:13:05 +0000 (19:13 +0000)]
Revert "Update for less arguments in hidl toBinder."
This reverts commit
de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d.
Change-Id: I6f451b0a05759501f59921747d95c6ae5b7ce656
Steven Moreland [Fri, 21 Jul 2017 18:19:40 +0000 (18:19 +0000)]
Merge "Update for less arguments in hidl toBinder." am:
602b7be04e
am:
b167ed08cc
Change-Id: I9beb7a7ee639f614260e5ba69496c0e7d9836742
Steven Moreland [Fri, 21 Jul 2017 18:13:01 +0000 (18:13 +0000)]
Merge "Update for less arguments in hidl toBinder."
am:
602b7be04e
Change-Id: I61f30db7a638c8c74925509e0bee1a7fffd5c546
Love Khanna [Fri, 21 Jul 2017 18:05:55 +0000 (18:05 +0000)]
Merge "NFC DTA Integration" am:
a42c8a1667 -s ours
am:
b9d0a22aaf
Change-Id: I4350ef8f09371b73ad1155ed2297627e66acc9d8
Love Khanna [Fri, 21 Jul 2017 17:56:59 +0000 (17:56 +0000)]
Merge "NFC DTA Integration"
am:
a42c8a1667 -s ours
Change-Id: I6edab80bee45eb4f95a36273857068487ff506b7
Treehugger Robot [Fri, 21 Jul 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Update for less arguments in hidl toBinder."
Treehugger Robot [Fri, 21 Jul 2017 17:38:53 +0000 (17:38 +0000)]
Merge "NFC DTA Integration"
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Steven Moreland [Thu, 20 Jul 2017 16:24:56 +0000 (09:24 -0700)]
Update for less arguments in hidl toBinder.
Removed unnecessary templatization argument.
Test: hidl_test_java
Bug:
32172906
Change-Id: I88cd2bf7abc3065ece4e28698ba5e0d836b1d0e3
Hugo Benichi [Fri, 21 Jul 2017 08:21:48 +0000 (08:21 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035
am:
3d423c9c39
Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121