OSDN Git Service
Hemal Patel [Thu, 4 Aug 2016 19:48:19 +0000 (19:48 +0000)]
Docs: Fixed info about spanning multiple columns am:
64e88cd296
am:
611f50d62f
Change-Id: Ie4daa14c817f2781e06a6a0d1d68a245780580e8
Hemal Patel [Thu, 4 Aug 2016 19:43:18 +0000 (19:43 +0000)]
Docs: Fixed info about spanning multiple columns
am:
64e88cd296
Change-Id: I8c4219e946fddbfc023bbe77549cc12fc0b6bd3a
Bert McMeen [Thu, 4 Aug 2016 18:28:27 +0000 (18:28 +0000)]
Docs: Fixed typo in API Overview am:
844c43a904
am:
653b768997
Change-Id: I55ac0a468ff1f0748ffeaca1b99b0c6992cef676
Bert McMeen [Thu, 4 Aug 2016 18:20:51 +0000 (18:20 +0000)]
Docs: Fixed typo in API Overview
am:
844c43a904
Change-Id: Ia855a58708afc4f12bae4b234b0f7ba10798aba4
Bert McMeen [Thu, 4 Aug 2016 18:08:50 +0000 (18:08 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
am:
62faea4f12
Change-Id: I849e6e3fed25bf7977263b1f57473dbaf544eb78
Bert McMeen [Thu, 4 Aug 2016 18:08:43 +0000 (18:08 +0000)]
Docs: Fixed typo in API Overview
am:
f27ab3c126
Change-Id: I08ed3c58d13fbeb93e331897641977633a6b807e
Bert McMeen [Tue, 2 Aug 2016 20:45:24 +0000 (13:45 -0700)]
Docs: Fixed typo in API Overview
Bug:
30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
(cherry picked from commit
f27ab3c12625f34a4221477001a603390b505e65)
Bert McMeen [Thu, 4 Aug 2016 18:01:27 +0000 (18:01 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
Chih-hung Hsieh [Thu, 4 Aug 2016 17:25:35 +0000 (17:25 +0000)]
Merge "Enable clang for arm64." am:
a11a8e5086
am:
9650521ed1
Change-Id: Ia9435472a720bc22255924cf4caee13eafda5870
Chih-Hung Hsieh [Thu, 4 Aug 2016 17:19:10 +0000 (17:19 +0000)]
Merge "Enable clang for arm64."
am:
a11a8e5086
Change-Id: If6069ad099ec5068b9b77f1ea84b85ff4a20438d
Chih-hung Hsieh [Thu, 4 Aug 2016 17:13:53 +0000 (17:13 +0000)]
Merge "Enable clang for arm64."
Chih-Hung Hsieh [Wed, 3 Aug 2016 17:56:33 +0000 (10:56 -0700)]
Enable clang for arm64.
emutls should work now with latest prebuilt clang/llvm.
BUG:
25642296
Test: build and boot up on arm64 emulator.
Change-Id: I5c8dd36a1575436e5fd56e91f7c285f2b3e6546f
(cherry picked from commit
8ffb6b76f7a72e14882e09f882494e5f7d5fc45d)
Przemyslaw Szczepaniak [Thu, 4 Aug 2016 12:08:22 +0000 (12:08 +0000)]
Missing test-current.txt for libcore change
ea47d5d712edcaef726a3e12065729be21699afe
am:
82957239fe
Change-Id: Ic29f6cd27e4f84dc5afb49360ffd2235ab25aa71
Przemyslaw Szczepaniak [Thu, 4 Aug 2016 11:54:39 +0000 (12:54 +0100)]
Missing test-current.txt for libcore change
ea47d5d712edcaef726a3e12065729be21699afe
Change-Id: I691a53f92bc1cfe0a9c6d5ad9d7d3d259ce0aabb
Test: make -j 32 update-api
Bug:
30402085
Tobias Thierer [Thu, 4 Aug 2016 11:06:54 +0000 (11:06 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am:
f1d119ccd3
am:
97b24c2f6a
Change-Id: I33dad5406389705ca2daa9baa75c1c7b42df046e
Tobias Thierer [Thu, 4 Aug 2016 11:00:03 +0000 (11:00 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"
am:
f1d119ccd3
Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
Tobias Thierer [Thu, 4 Aug 2016 10:51:13 +0000 (10:51 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"
Sreevani Sreejith [Thu, 4 Aug 2016 02:37:12 +0000 (02:37 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs am:
3faf6114b0
am:
f5a2fbc156
Change-Id: I914433dbb9ab473d9dc14b317478af0a1db92e23
sreevanis [Thu, 4 Aug 2016 02:37:09 +0000 (02:37 +0000)]
resolve merge conflicts of
9d47cae to nyc-docs am:
d5cabb92bc
am:
fdaac48e99
Change-Id: I525b4b81660dfd21e7ef992ee803f94d58c629b9
sreevanis [Thu, 4 Aug 2016 02:23:43 +0000 (02:23 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
am:
3faf6114b0
Change-Id: I80e8d39a9d6f58e2cc3091690f202d1453a6b8e6
sreevanis [Thu, 4 Aug 2016 02:23:39 +0000 (02:23 +0000)]
resolve merge conflicts of
9d47cae to nyc-docs
am:
d5cabb92bc
Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
Sreevani Sreejith [Thu, 4 Aug 2016 02:14:25 +0000 (02:14 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
Andre Eisenbach [Thu, 4 Aug 2016 01:43:00 +0000 (01:43 +0000)]
Merge "HFP 1.7 profile update (3/4)" am:
f28f6bb2b0
am:
a095ee3c1d
Change-Id: I31570d1d9da08e6d7481ffead5ef7625c88018f2
Mudumba Ananth [Thu, 4 Aug 2016 01:32:41 +0000 (01:32 +0000)]
Merge "HFP 1.7 profile update (3/4)"
am:
f28f6bb2b0
Change-Id: I0211cecf91f324d24b7b5524344812f7d6b6602a
Kevin Hufnagle [Thu, 4 Aug 2016 01:14:36 +0000 (01:14 +0000)]
docs: Updated wording of callout describing device opt-out options. am:
b48909ed52
am:
bdbe6fd94f
Change-Id: I0a74e4b1b26a5456e9df547333ddd2e4cf51de20
Andre Eisenbach [Thu, 4 Aug 2016 01:06:46 +0000 (01:06 +0000)]
Merge "HFP 1.7 profile update (3/4)"
Joe Fernandez [Thu, 4 Aug 2016 01:05:50 +0000 (01:05 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am:
51a582fa85
am:
6ad22ca614
Change-Id: I0325827620ff0e37e65d1ea0c97adeec875de678
Joe Fernandez [Thu, 4 Aug 2016 01:05:47 +0000 (01:05 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am:
712c053462
am:
337279df50
Change-Id: I4652d7267c8796e709dfc82dd9417a8aa704128f
Joe Fernandez [Thu, 4 Aug 2016 01:05:44 +0000 (01:05 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am:
d6f1d8ea28
am:
0af74fa732
Change-Id: I8e166e01d329bc6ef325958ae0a09029f8eacd2f
Kevin Hufnagle [Thu, 4 Aug 2016 01:05:11 +0000 (01:05 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC am:
684d849621
am:
a007a4d772
Change-Id: I136646a94f44386cc39f3d9d7c6f688116a85db0
Kevin Hufnagle [Thu, 4 Aug 2016 01:04:02 +0000 (01:04 +0000)]
docs: Added page on DAC describing ARC manifest file considerations. am:
178caa888f
am:
ebd455b077
Change-Id: I4f229345b1f8198048dc1eb9a4da9ca0e8f94cc3
Kevin Hufnagle [Thu, 4 Aug 2016 01:03:32 +0000 (01:03 +0000)]
docs: Updated wording of callout describing device opt-out options.
am:
b48909ed52
Change-Id: I120725cdb7304e037bc72da73d56fbf901bfe9aa
Joe Fernandez [Thu, 4 Aug 2016 00:57:22 +0000 (00:57 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
am:
51a582fa85
Change-Id: I8be83bf47ae26a6bf9d0f812265c91133be40be3
Joe Fernandez [Thu, 4 Aug 2016 00:57:20 +0000 (00:57 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file
am:
712c053462
Change-Id: I113c2c5b9391488eedf743220f6ef4c5ec283d6c
Kevin Hufnagle [Thu, 4 Aug 2016 00:57:16 +0000 (00:57 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
am:
d6f1d8ea28
Change-Id: I222fa49789c2f2baac7ff2296617052c9924a328
Kevin Hufnagle [Thu, 4 Aug 2016 00:57:14 +0000 (00:57 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC
am:
684d849621
Change-Id: Ic5e11fdcd44ce86f901cc22954192d79283bca93
Kevin Hufnagle [Thu, 4 Aug 2016 00:56:42 +0000 (00:56 +0000)]
docs: Added page on DAC describing ARC manifest file considerations.
am:
178caa888f
Change-Id: I68b8395dc90245ac7db6892f86b036d2b88ad96e
Mudumba Ananth [Mon, 29 Feb 2016 10:14:36 +0000 (02:14 -0800)]
HFP 1.7 profile update (3/4)
-> Android Framework changes to add support for
an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
of the supported HF indicators and their values (if received)
Bug:
19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
(cherry picked from commit
0d98ebf997b24e96d0328b4195a22832f9ae2664)
Joe Fernandez [Thu, 4 Aug 2016 00:45:09 +0000 (00:45 +0000)]
resolve merge conflicts of
b29a938c to nyc-dev
am:
473738d6d3
Change-Id: I4691daf7c5fac223afa133f15637c01c72194216
Kevin Hufnagle [Thu, 4 Aug 2016 00:38:27 +0000 (17:38 -0700)]
docs: Updated wording of callout describing device opt-out options.
Bug:
30204612
Change-Id: I80b0a6840da6ca7310e626cec66717c3e1372403
Kevin Hufnagle [Thu, 4 Aug 2016 00:18:15 +0000 (17:18 -0700)]
resolve merge conflicts of
b29a938c to nyc-dev
Change-Id: I840d069b8ffab03b0a7c1fc73ba7eae485c80abb
Jakub Pawlowski [Thu, 4 Aug 2016 00:12:46 +0000 (00:12 +0000)]
Merge "Remove write type from GATT descriptor writes (1/4)" am:
b7eb1d7eaf
am:
0aa5797976
Change-Id: I7131629944d7a2569440ced1e48900ec5ff883d7
Jakub Pawlowski [Thu, 4 Aug 2016 00:01:25 +0000 (00:01 +0000)]
Merge "Remove write type from GATT descriptor writes (1/4)"
am:
b7eb1d7eaf
Change-Id: Ibe16bab7ec21d19d6f3cfd5cb65768b06a5ca829
Joe Fernandez [Wed, 3 Aug 2016 23:55:40 +0000 (23:55 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev
am:
7eb9f10fec
Change-Id: If5214591677f2ead53acef24e6b610fa73db7979
Joe Fernandez [Wed, 3 Aug 2016 23:55:34 +0000 (23:55 +0000)]
docs: Add ARC documentation TOC file
am:
a117b34777
Change-Id: I3c9b7303faab3293fcab6229064044bb81de51c9
Treehugger Robot [Wed, 3 Aug 2016 23:54:35 +0000 (23:54 +0000)]
Merge "Remove write type from GATT descriptor writes (1/4)"
Kevin Hufnagle [Wed, 3 Aug 2016 23:54:15 +0000 (23:54 +0000)]
Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev
am:
4c273d1ffe
Change-Id: Ie64ed93580f5ba5e5e94dfc99f421b8c01f3fbf2
Kevin Hufnagle [Wed, 3 Aug 2016 23:53:49 +0000 (23:53 +0000)]
docs: Added page on DAC describing ARC manifest file considerations.
am:
97a3d3c3a6
Change-Id: I30f3f08575e8b959a46f47f7f32397f6854e621a
Kevin Hufnagle [Wed, 3 Aug 2016 23:53:22 +0000 (23:53 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev
am:
369246377a
Change-Id: Ic292e799dd4282f69950a8364a429d32c07e151e
Kevin Hufnagle [Wed, 3 Aug 2016 23:52:55 +0000 (23:52 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC
am:
9cd48bb447
Change-Id: Ieecc7bca2ef4d9e987554c4552a1025ab51e7bd7
Joe Fernandez [Wed, 3 Aug 2016 23:42:24 +0000 (23:42 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
Joe Fernandez [Tue, 2 Aug 2016 00:25:17 +0000 (00:25 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file
Bug:
30114799
Change-Id: I4884bf4a39ae99e661365040d5b34d5b8e2d2ea2
Original-Change-Id: Ib4e3c5b255c9e1e9c2894b3703deb1d38f252fba
Joe Fernandez [Wed, 3 Aug 2016 23:35:23 +0000 (23:35 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
Kevin Hufnagle [Thu, 28 Jul 2016 17:20:32 +0000 (10:20 -0700)]
docs: Migrated "Android Runtime on Chrome" pages to DAC
Bug:
30204612
Change-Id: I02a325100ee7f24bcd87c6f77a0d9e8799bae9a3
(cherry picked from commit
9cd48bb447eb7dd10dc29ed311ac8efe4f3e4ddf)
Kevin Hufnagle [Fri, 29 Jul 2016 20:13:39 +0000 (13:13 -0700)]
docs: Added page on DAC describing ARC manifest file considerations.
Bug:
30114799
Change-Id: I9b8d67d09e4627f22a9fc58421dd52aa3650c235
(cherry picked from commit
97a3d3c3a626656a1b3ae61dcf380ac993ff6ca8)
Joe Fernandez [Wed, 3 Aug 2016 23:25:15 +0000 (23:25 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev
Joe Fernandez [Wed, 3 Aug 2016 23:25:15 +0000 (23:25 +0000)]
Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev
Joe Fernandez [Wed, 3 Aug 2016 23:25:15 +0000 (23:25 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev
Joe Fernandez [Mon, 1 Aug 2016 15:19:03 +0000 (08:19 -0700)]
docs: Add ARC documentation TOC file
b/
30114799
Change-Id: I397f4712c82628f1b7aa4565fb5ab40381f9f5e2
(cherry picked from commit
129012530ffae6d3d52ba0f093ade0f6a8afce1b)
Prashant Malani [Wed, 3 Aug 2016 23:14:36 +0000 (23:14 +0000)]
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable am:
61038ddb61 -s ours am:
1353c06d83 -s ours
am:
122ad2f0bc -s ours
Change-Id: I70343b2d8afaee0cf891c05b3002e5a79d2d87ee
Kevin Hufnagle [Thu, 28 Jul 2016 17:20:32 +0000 (10:20 -0700)]
docs: Migrated "Android Runtime on Chrome" pages to DAC
Bug:
30204612
Change-Id: I02a325100ee7f24bcd87c6f77a0d9e8799bae9a3
Prashant Malani [Wed, 3 Aug 2016 23:07:08 +0000 (23:07 +0000)]
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable am:
61038ddb61 -s ours
am:
1353c06d83 -s ours
Change-Id: I95ee4044d8d303a1cecb2a5a1e46ca371db86f3d
Prashant Malani [Wed, 3 Aug 2016 23:01:50 +0000 (23:01 +0000)]
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable
am:
61038ddb61 -s ours
Change-Id: Id9a09514011ddf7c15106e22e06d24079e3cdb31
Prashant Malani [Tue, 29 Mar 2016 23:32:37 +0000 (16:32 -0700)]
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable
Add an overlay setting, and keep the default to its existing value of
200.
Bug:
26552257
Change-Id: Ifd29d80e28e57c5cfc640d519a62144ab5e963fa
sreevanis [Wed, 3 Aug 2016 21:47:58 +0000 (14:47 -0700)]
resolve merge conflicts of
9d47cae to nyc-docs
Change-Id: I737539c2bdaca60ac1dac3ca5ecb815c9bd440ab
Hemal Patel [Wed, 3 Aug 2016 01:16:13 +0000 (18:16 -0700)]
Docs: Fixed info about spanning multiple columns
Corrected the information related to the spanning of multiple columns.
As per the reference documentation, cells can span multiple columns. Added
information about how to span multiple columns and provided a reference
link for more details.
Bug:
24760839
Change-Id: I32d51d27db94f61dfa83f7fe1fe94ca58708a2d0
sreevanis [Thu, 28 Jul 2016 17:52:37 +0000 (10:52 -0700)]
docs:Updated logos in Auto index page.
Bug:
29533703
Change-Id: Ibf7b1675071591c9f128bffb092b9989068e83d6
Jakub Pawlowski [Thu, 31 Mar 2016 05:58:17 +0000 (22:58 -0700)]
Remove write type from GATT descriptor writes (1/4)
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used
for this sub-procedure".
Change-Id: I141dd24ed5911d5d485b52a1b661835b9960921a
Tobias Thierer [Wed, 3 Aug 2016 16:19:27 +0000 (17:19 +0100)]
Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)
Test: "make" succeeds.
Bug:
30402085
Change-Id: I4bc4b5dcfab04ac756578c2fae7a337e74587b66
Tobias Thierer [Wed, 3 Aug 2016 13:06:01 +0000 (13:06 +0000)]
Merge "Stop profiling on uncaught exception." am:
258a554f62
am:
2dc1fe659a
Change-Id: I10752fdb75026061ffbc82addaf7ed36cbfc359e
Jakub Pawlowski [Wed, 3 Aug 2016 13:05:48 +0000 (13:05 +0000)]
Merge "GATT Server refactoring (2/4)" am:
d13954e8c6
am:
fe4b1e47fc
Change-Id: Id4a88b39102b3acbc09e203e09637c40ae81bb89
Tobias Thierer [Wed, 3 Aug 2016 13:01:05 +0000 (13:01 +0000)]
Merge "Stop profiling on uncaught exception."
am:
258a554f62
Change-Id: Ia62b8fea4337eb2742b315f1682d5830d068fc77
Jakub Pawlowski [Wed, 3 Aug 2016 12:59:24 +0000 (12:59 +0000)]
Merge "GATT Server refactoring (2/4)"
am:
d13954e8c6
Change-Id: I10383d95f79409282d96ae60b294c72754df5641
Tobias Thierer [Wed, 3 Aug 2016 10:42:37 +0000 (10:42 +0000)]
Merge "Stop profiling on uncaught exception."
Jakub Pawlowski [Wed, 3 Aug 2016 10:21:43 +0000 (10:21 +0000)]
Merge "GATT Server refactoring (2/4)"
Tobias Thierer [Wed, 3 Aug 2016 10:09:22 +0000 (10:09 +0000)]
Merge "Fixes the system server crash issue caused by uncatched exception." am:
b68106cf2a
am:
ca7a43b5da
Change-Id: I51d5a6e7194a2fddfbedafbddb9816649ae4aa44
Tobias Thierer [Wed, 3 Aug 2016 10:09:19 +0000 (10:09 +0000)]
Merge "remove x attribute of java file" am:
554284edf3
am:
52fdb4750a
Change-Id: I09db9140427da70ea3e946a383367533afc81110
songjinshi [Wed, 3 Aug 2016 10:03:59 +0000 (10:03 +0000)]
Merge "Fixes the system server crash issue caused by uncatched exception."
am:
b68106cf2a
Change-Id: Ia28f7bdad020dbb3695934cae1f193037de41fcb
Ganesh Mahendran [Wed, 3 Aug 2016 10:03:53 +0000 (10:03 +0000)]
Merge "remove x attribute of java file"
am:
554284edf3
Change-Id: I05553fd2ecc175858e0923e68e62305149e8dd3e
Tobias Thierer [Wed, 3 Aug 2016 09:54:53 +0000 (09:54 +0000)]
Merge "Fixes the system server crash issue caused by uncatched exception."
Tobias Thierer [Wed, 3 Aug 2016 09:54:23 +0000 (09:54 +0000)]
Merge "remove x attribute of java file"
Kevin Hufnagle [Fri, 29 Jul 2016 20:13:39 +0000 (13:13 -0700)]
docs: Added page on DAC describing ARC manifest file considerations.
Bug:
30114799
Change-Id: I9b8d67d09e4627f22a9fc58421dd52aa3650c235
Joe Fernandez [Tue, 2 Aug 2016 00:25:17 +0000 (00:25 +0000)]
docs: Add ARC documentation TOC file
Bug:
30114799
Change-Id: Ib4e3c5b255c9e1e9c2894b3703deb1d38f252fba
John Stultz [Wed, 3 Aug 2016 00:17:56 +0000 (00:17 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am:
1085be0ce3
am:
5e23ab394a
Change-Id: If1d303010a604bf6c1c745ea9e2d920eea20f5aa
John Stultz [Wed, 3 Aug 2016 00:12:32 +0000 (00:12 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
am:
1085be0ce3
Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
Treehugger Robot [Wed, 3 Aug 2016 00:04:19 +0000 (00:04 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
Andrew Solovay [Tue, 2 Aug 2016 21:47:40 +0000 (21:47 +0000)]
cherry-pick from nyc-dev: docs: SafeBrowsing API am:
741757f27f
am:
328a6a12eb
Change-Id: I442d5474cef4b92917f7604e3127dfad0fd6d74f
Joe Fernandez [Tue, 2 Aug 2016 21:40:19 +0000 (21:40 +0000)]
Resolve merge conflicts of
ffb4eb1 to nyc-dev
am:
a5abfee3a5
Change-Id: I01aae4c96bba37ef8e2466821fdce39881d3e022
Joe Fernandez [Tue, 2 Aug 2016 21:36:02 +0000 (21:36 +0000)]
cherry-pick from nyc-dev: docs: SafeBrowsing API
am:
741757f27f
Change-Id: Ice1968509af665160646025e708d3802b39ef4c4
Bert McMeen [Tue, 2 Aug 2016 20:45:24 +0000 (13:45 -0700)]
Docs: Fixed typo in API Overview
Bug:
30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
Andrew Solovay [Tue, 2 Aug 2016 21:14:08 +0000 (14:14 -0700)]
docs: Fixing download redirects
URLS of the form https://developer.android.com/downloads/… weren't
properly redirecting to
https://commondatastorage.googleapis.com/androiddevelopers/…
bug:
30594087
Change-Id: I18e026c236d081b6bb510900e5928107105b93cd
Jakub Pawlowski [Fri, 1 Apr 2016 14:51:45 +0000 (07:51 -0700)]
GATT Server refactoring (2/4)
Bug:
27999121
Change-Id: Ia5f91298a4b01b62adebc8adc30f27f757259588
Ganesh Mahendran [Tue, 28 Jun 2016 07:59:45 +0000 (15:59 +0800)]
remove x attribute of java file
java file do not need x attribute, so this patch
removes it.
Change-Id: I807722ac3f40688f032228294d61a4266d0e9e60
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Kevin Hufnagle [Tue, 2 Aug 2016 18:11:22 +0000 (11:11 -0700)]
Resolve merge conflicts of
ffb4eb1 to nyc-dev
Change-Id: I2f096fc31de12fb4e4715343854a5f09049e4221
Joe Fernandez [Tue, 12 Apr 2016 18:35:23 +0000 (11:35 -0700)]
cherry-pick from nyc-dev: docs: SafeBrowsing API
b/
27438791
Change-Id: Ib7f93a7e95068c1909a3b104b83681e2d2f35ee6
Original-Change-Id: I14a34bbec51dc33dd4d730d59268690c9bee3992
Tobias Thierer [Tue, 2 Aug 2016 16:32:26 +0000 (17:32 +0100)]
Stop profiling on uncaught exception.
When "handling" an uncaught exception, make an attempt to stop
profiling. In case profiling was active, this will avoid losing
the profiling buffer.
This change is required as a base in order for
https://android-review.googlesource.com/#/c/249721/
to merge cleanly.
(Cherry picked from commit
4c79fea9efea7cfa739cf5b5f525ddadb28e52a6)
Bug:
26291225
Change-Id: I35f352e5f28eafe4702da9eae587c3b65c360b3a
songjinshi [Wed, 27 Jul 2016 12:36:46 +0000 (20:36 +0800)]
Fixes the system server crash issue caused by uncatched exception.
The restat method of the StatFs may throw an IllegalArgumentException,
so we must to catch it and throw an IOException for the caller
of the trimToFit(),this fix can improve system stability.
https://code.google.com/p/android/issues/detail?id=218359
Change-Id: I54a2f569eea67d3ab628944e3586ca918ec70283
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Joe Fernandez [Tue, 2 Aug 2016 00:38:51 +0000 (00:38 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev
am:
2b318b3a4e
Change-Id: I31072557343554054f7ce2163c2d0485bd36611c
Joe Fernandez [Tue, 2 Aug 2016 00:38:29 +0000 (00:38 +0000)]
docs: Add ARC documentation TOC file
am:
129012530f
Change-Id: Ibd9b721fc87de52f81400936b6fbb8ad1f167fee
Joe Fernandez [Tue, 2 Aug 2016 00:25:17 +0000 (00:25 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev