OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "fix dashboards page. the src attributes were being modified by the devsite...
smain@google.com [Fri, 20 May 2016 00:14:02 +0000 (00:14 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc
am: ccf143ea10

* commit 'ccf143ea106de35de35d4829ade55ba78b7a3fee':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I42306e09cb173642840ee29130bb80e9da347a81

8 years agoMerge "fix dashboards page. the src attributes were being modified by the devsite...
Scott Main [Fri, 20 May 2016 00:08:46 +0000 (00:08 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44
am: 9ad92619dc

* commit '9ad92619dc455a42c40e5b102e2fdf65c2787549':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I52fc62f8f233682a6707a4c1e5ef67f42844551b

8 years agoMerge "fix dashboards page. the src attributes were being modified by the devsite...
smain@google.com [Fri, 20 May 2016 00:05:01 +0000 (00:05 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs
am: 486f792d44

* commit '486f792d4448819c47c7e18dfd4ccb40133df528':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: Iffb768397f425b34c1e297d40c9b1077d1e7ad5d

8 years agoMerge "fix dashboards page. the src attributes were being modified by the devsite...
Scott Main [Thu, 19 May 2016 23:54:19 +0000 (23:54 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs

8 years agoupdate links to studio docs am: 73cf8224cb
smain@google.com [Thu, 19 May 2016 23:47:54 +0000 (23:47 +0000)]
update links to studio docs am: 73cf8224cb
am: f7304c8cc8

* commit 'f7304c8cc8aa947558be355fd0c547f418e44931':
  update links to studio docs

Change-Id: I9886a9618513c63f02add34b12761f8d35afb1da

8 years agoupdate links to studio docs
smain@google.com [Thu, 19 May 2016 23:43:17 +0000 (23:43 +0000)]
update links to studio docs
am: 73cf8224cb

* commit '73cf8224cbd97918d6407aac79a97c6ef70b9a30':
  update links to studio docs

Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78

8 years agoupdate links to studio docs
smain@google.com [Thu, 19 May 2016 23:30:43 +0000 (16:30 -0700)]
update links to studio docs

Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c

8 years agoMerge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am...
Dirk Dougherty [Thu, 19 May 2016 23:19:12 +0000 (23:19 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc
am: 8053c79246

* commit '8053c79246f14a78158b6476169299999299d6d8':
  Remove outdated google services links.

Change-Id: I4c85952e4962381261e42d3ecf1c3408a57ab55e

8 years agoMerge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9
Dirk Dougherty [Thu, 19 May 2016 23:13:57 +0000 (23:13 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9
am: 5fb577e6bc

* commit '5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
  Remove outdated google services links.

Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b

8 years agoMerge "Remove outdated google services links." into mnc-mr-docs
Dirk Dougherty [Thu, 19 May 2016 23:07:10 +0000 (23:07 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs
am: dc40b80ae9

* commit 'dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
  Remove outdated google services links.

Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca

8 years agoMerge "Remove outdated google services links." into mnc-mr-docs
Dirk Dougherty [Thu, 19 May 2016 23:01:53 +0000 (23:01 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs

8 years agoRemove outdated google services links.
Dirk Dougherty [Thu, 19 May 2016 22:57:40 +0000 (15:57 -0700)]
Remove outdated google services links.

Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:59:26 +0000 (22:59 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6  -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197
am: 7298186769  -s ours

* commit '7298186769395978045ed2d35252cdf7f644d85b':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I93f337a4e85a4e20e91fbbf7bd7aeb48bd0df735

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:54:05 +0000 (22:54 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6  -s ours am: a7895725f8 am: 0f59d9b80c
am: 08a4808197

* commit '08a480819763dd632fd8006a0ea57b8220ee121a':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:50:55 +0000 (22:50 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6  -s ours am: a7895725f8
am: 0f59d9b80c

* commit '0f59d9b80c9f5daa321b683525ba8732add007c2':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6

8 years agodocs: Update to column widths for Complications table am: 76372f02fe
Bert McMeen [Thu, 19 May 2016 22:50:53 +0000 (22:50 +0000)]
docs: Update to column widths for Complications table am: 76372f02fe
am: 4cdad3212e

* commit '4cdad3212e67fabbfe4ba68f7b214be5ff5c10af':
  docs: Update to column widths for Complications table

Change-Id: I22f82c2ca729b9d679fc077dbc9b54c85a70d6fc

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:47:05 +0000 (22:47 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6  -s ours
am: a7895725f8

* commit 'a7895725f8858465a404cbe4f6d5091e39423529':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63

8 years agodocs: Update to column widths for Complications table
Bert McMeen [Thu, 19 May 2016 22:44:13 +0000 (22:44 +0000)]
docs: Update to column widths for Complications table
am: 76372f02fe

* commit '76372f02fe149aefccea502bf1ac0dca2693e84b':
  docs: Update to column widths for Complications table

Change-Id: I67578fd73f26af6ef2187e4e9823fb71e89f990e

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:43:14 +0000 (22:43 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours am: 1fae3b370d am: 1da8c9baa2
am: 8238207ce6  -s ours

* commit '8238207ce6268422bcdb50d44f03e6a220081294':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58

8 years agoMerge "Update BlockedNumberContract javadocs." into nyc-dev
Abhijith Shastry [Thu, 19 May 2016 22:43:11 +0000 (22:43 +0000)]
Merge "Update BlockedNumberContract javadocs." into nyc-dev

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:37:04 +0000 (22:37 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours am: 1fae3b370d
am: 1da8c9baa2

* commit '1da8c9baa2d2da49e14224d34995337c4709b1ad':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:32:47 +0000 (22:32 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours
am: 1fae3b370d

* commit '1fae3b370dfd9536da166ef561df630cdff02b83':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1...
John Reck [Thu, 19 May 2016 22:28:23 +0000 (22:28 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours
am: bfa719f448  -s ours

* commit 'bfa719f448ab4d90368a3cdc556e515253528e17':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5
John Reck [Thu, 19 May 2016 22:21:46 +0000 (22:21 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5
am: 5527fd1323  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd

8 years agoMerge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev
Miao Wang [Thu, 19 May 2016 22:16:54 +0000 (22:16 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev

8 years agoDO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
John Reck [Thu, 19 May 2016 22:16:42 +0000 (22:16 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315

8 years agoMerge "Update documentation about copyTo and copyFrom." into nyc-dev
Miao Wang [Thu, 19 May 2016 22:16:37 +0000 (22:16 +0000)]
Merge "Update documentation about copyTo and copyFrom." into nyc-dev

8 years agofix dashboards page.
smain@google.com [Thu, 19 May 2016 22:08:51 +0000 (15:08 -0700)]
fix dashboards page.
the src attributes were being modified by the devsite parser,
so i renamed those attributes then rename them again at runtime.
bug: 28801246

Change-Id: I34d0dff8fa7f430226dd1d12fccb2cdbeda365db

8 years agodocs: Update to column widths for Complications table
Bert McMeen [Thu, 19 May 2016 22:01:38 +0000 (15:01 -0700)]
docs: Update to column widths for Complications table

Bug: 28864917
Change-Id: Ie02b5dd82789055b2a0994438065fc373ddf70b6

8 years agoMerge "Fix a11y crash when window layer isn't unique." into nyc-dev
Phil Weaver [Thu, 19 May 2016 21:50:28 +0000 (21:50 +0000)]
Merge "Fix a11y crash when window layer isn't unique." into nyc-dev

8 years agoMerge "Never set resized while not drag resizing for pinned stack." into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 21:42:20 +0000 (21:42 +0000)]
Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev

8 years agoMerge "Fixed a bug where the chronometer was invisible" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 20:40:25 +0000 (20:40 +0000)]
Merge "Fixed a bug where the chronometer was invisible" into nyc-dev

8 years agoMerge "Fixed a bug where the chronometer wasn't updating the time" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 20:39:33 +0000 (20:39 +0000)]
Merge "Fixed a bug where the chronometer wasn't updating the time" into nyc-dev

8 years agoFix a11y crash when window layer isn't unique.
Phil Weaver [Thu, 19 May 2016 17:32:52 +0000 (10:32 -0700)]
Fix a11y crash when window layer isn't unique.

TalkBack is seeing crashes that I can only explain by our assumption
that window layer is unique in all cases. TalkBack reports that it
happens during animation, so I assume that the layer may repeat
transiently.

Reducing our dependence on this assumption by traversing the list of
windows sorted by layer without assuming that the list has the same
length as the list of unsorted windows.

Also documenting the undefined behavior of SparseArray when indexing
beyond its bounds. The undefined behavior itself is intentional for
performance reasons.

Bug: 28679528
Bug: 28815817
Change-Id: I0c9f90b0b458b4cde465f603ba204fe6691e5c2c

8 years agoMerge "Fix RTL issue in delete dialog." into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 20:24:34 +0000 (20:24 +0000)]
Merge "Fix RTL issue in delete dialog." into nyc-dev

8 years agoNever set resized while not drag resizing for pinned stack.
Robert Carr [Wed, 18 May 2016 21:53:16 +0000 (14:53 -0700)]
Never set resized while not drag resizing for pinned stack.

It's not necessary in the pinned stack and interferes with the
animation. It's not enough to just check getBoundsAnimating, as
we turn that off prior to the final resize so that we unmute
notifications to the client.

Bug: 28559097
Change-Id: Iae180c8a8ca0585184efcf24e7677557a33678eb

8 years agoMerge "Fix GATT autoConnect race condition" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 19:38:55 +0000 (19:38 +0000)]
Merge "Fix GATT autoConnect race condition" into nyc-dev

8 years agoMerge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev
Chris Tate [Thu, 19 May 2016 19:34:07 +0000 (19:34 +0000)]
Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev

8 years agoDO NOT MERGE Cherry pick libpng usage fixes
John Reck [Thu, 19 May 2016 19:26:24 +0000 (19:26 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes
am: 7c9f2b8aa2

* commit '7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 18:45:25 +0000 (18:45 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 am: f7688a4f29
am: 6badb0fb54

* commit '6badb0fb54a72026dfe5d04e2556637b116a9c91':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: Ie324dd06265e48abe229c101f638e98e906bb199

8 years agoMerge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev
Wyatt Riley [Thu, 19 May 2016 18:37:53 +0000 (18:37 +0000)]
Merge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 18:35:30 +0000 (18:35 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53
am: f7688a4f29

* commit 'f7688a4f297fcab18ffdbd0ed10405ba862e8ec9':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I7f3c0af53759216af85351d950631af81cdf1316

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 18:31:33 +0000 (18:31 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1
am: c387613d53

* commit 'c387613d53284816ebb00ebeb41633f6179fc972':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I648ee1970cae83a816e9462dcbdd2208b7c205d4

8 years agoWhile turning OFF do not honor ON requests.
Sanket Agarwal [Thu, 21 Apr 2016 21:10:55 +0000 (14:10 -0700)]
While turning OFF do not honor ON requests.

Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.

This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.

Bug: b/28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc

8 years agoFix GATT autoConnect race condition
Sungki Kim [Thu, 19 May 2016 17:18:07 +0000 (10:18 -0700)]
Fix GATT autoConnect race condition

As pointed out here:
https://code.google.com/p/android/issues/detail?id=69834

registerApp() causes onClientRegistered() to happen before autoConnect
is set. This patch fixes that.

Bug: 28861330
Change-Id: Ie1174c0f224f5084178439420b383164d22d542c

8 years agoFix RTL issue in delete dialog.
Steve McKay [Wed, 18 May 2016 23:25:41 +0000 (16:25 -0700)]
Fix RTL issue in delete dialog.

Bug:28772371
Change-Id: Ia5d3e074ac40b73f21cc83f507735d0918799966

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 18:21:26 +0000 (18:21 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c
am: 8fc4c789f1

* commit '8fc4c789f1a356d765e98b0c3f1569fabbfb0890':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I42b9e0c852a685bd0ae1d5dd1145769b9dfd095d

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 18:10:27 +0000 (18:10 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8
am: f6987bc94c

* commit 'f6987bc94c00fa1390aee6f665a560dcb94d7942':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: Ice3af646ca302dea7797a2ff65ed83da7beaaa90

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 17:59:55 +0000 (17:59 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd
am: b6f51341e8

* commit 'b6f51341e8bb34de8dfdc2694599c7090971fdf8':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I323752b6f1f51a659af0aa84e7305c75ccbf0552

8 years agoMerge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev
Sergio Giro [Thu, 19 May 2016 17:52:59 +0000 (17:52 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 17:49:59 +0000 (17:49 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs
am: 36785ff4bd

* commit '36785ff4bda29f8055864e081012e12077509889':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I9f50650cb3d52ba76aa61a28b9bf3aef36682d83

8 years agoIncorporate feedback on new wallpaper-related APIs
Christopher Tate [Thu, 19 May 2016 00:31:58 +0000 (17:31 -0700)]
Incorporate feedback on new wallpaper-related APIs

- Documentation
- Method naming
- Throwing exceptions rather than returning zero/null/false on input failures

Bug 28773334

Change-Id: Ia41c1e31c76b7114f3ffeb16033384cac5a1031d

8 years agoMerge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table...
Chris Craik [Thu, 19 May 2016 17:22:56 +0000 (17:22 +0000)]
Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs

8 years agoMerge "Merge "docs: Restored references to "Know Your User" resource cards." into...
Android Build Merger (Role) [Thu, 19 May 2016 17:13:47 +0000 (17:13 +0000)]
Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev

8 years agoMerge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into...
Android Build Merger (Role) [Thu, 19 May 2016 17:13:37 +0000 (17:13 +0000)]
Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev

8 years agoMerge "docs: Restored references to "Know Your User" resource cards." into mnc-docs...
Kevin Hufnagle [Thu, 19 May 2016 17:13:05 +0000 (17:13 +0000)]
Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5
am: 6b077de7d7

* commit '6b077de7d7c02f46c3a74430fa1b739d23d8c1c2':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I7f263ab12836c7f8cf734425dbe10fea3444572e

8 years agoMerge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs...
Kevin Hufnagle [Thu, 19 May 2016 17:12:51 +0000 (17:12 +0000)]
Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27
am: 2ebb73e557

* commit '2ebb73e5572eb400d6202c9a0e3d365e1fde9d7e':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I43a8431d48244a6807924239eac4c5211ce380b3

8 years agoMerge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev
Andrii Kulian [Thu, 19 May 2016 17:11:34 +0000 (17:11 +0000)]
Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev

8 years agoMerge "docs: Restored references to "Know Your User" resource cards." into mnc-docs...
Kevin Hufnagle [Thu, 19 May 2016 17:05:53 +0000 (17:05 +0000)]
Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3
am: 8dc9a826d5

* commit '8dc9a826d5b7d5a9e4e83374430f95a38a7775e3':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I5e24c5f0cb5d1434dd924e2706d1a26a47b528f8

8 years agoMerge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs...
Kevin Hufnagle [Thu, 19 May 2016 17:05:50 +0000 (17:05 +0000)]
Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec
am: 2c98879a27

* commit '2c98879a2793b8607eb4539925e9d1fb38d78610':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I9f254da6427cea0ad4f4edc2fde8e17d679c4017

8 years agoMerge "docs: Restored references to "Know Your User" resource cards." into mnc-docs...
Kevin Hufnagle [Thu, 19 May 2016 16:57:10 +0000 (16:57 +0000)]
Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a
am: 940de083a3

* commit '940de083a3e2ac5176f36d5b8bd6f88f5d1813dd':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I8f0f13d2b3099d41d9ae31de75728fd9f46283ce

8 years agoMerge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs...
Kevin Hufnagle [Thu, 19 May 2016 16:57:08 +0000 (16:57 +0000)]
Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d
am: 4af01c1aec

* commit '4af01c1aecc8db2fd084822294ad193a72a34fa7':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I455575a25350b7a0c66b5f8d698d6d0fc51076a5

8 years agoMapping up/down of legacy Gps vs. Gnss Status
Wyatt Riley [Tue, 17 May 2016 23:14:48 +0000 (16:14 -0700)]
Mapping up/down of legacy Gps vs. Gnss Status

- Maps incoming (from HAL) GpsSvStatus for Glonass, Beidou, SBAS, and QZSS
  from defacto (NMEA-like) numbers to internal platform with detected constellation.
- Maps outgoing (to Java API) GpsStatus getSatellite info back into the de-facto
  overloaded (beyond 32) "GPS" ID numbers.
- Simplifies Glonass ID definition for N (comments only.)
- This enables GPS/GNSS Test apps a non-degrading upgrade path.

Bug: 28623392
Change-Id: I9a19db1f11267032c6927daed767df5afa51c770

8 years agoMerge "docs: Restored references to "Know Your User" resource cards." into mnc-docs
Kevin Hufnagle [Thu, 19 May 2016 16:48:54 +0000 (16:48 +0000)]
Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs
am: dbfd7dd16a

* commit 'dbfd7dd16a383e41f5a59c2b63231e0848563770':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I7d350d7574396e0216b2b72ed9e1725242c3fb88

8 years agoMerge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs
Kevin Hufnagle [Thu, 19 May 2016 16:48:51 +0000 (16:48 +0000)]
Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs
am: 8262d9c00d

* commit '8262d9c00d7332e7f013ef1af6ea818a5d248ec5':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I56f21d12417b7157f749b02e9f3949bdbace5751

8 years agoMerge "docs: Restored references to "Know Your User" resource cards." into mnc-docs
Kevin Hufnagle [Thu, 19 May 2016 16:43:40 +0000 (16:43 +0000)]
Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs

8 years agoMerge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs
Kevin Hufnagle [Thu, 19 May 2016 16:43:30 +0000 (16:43 +0000)]
Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs

8 years agoZygoteInit: install AndroidKeyStoreProvider in the Zygote
Sergio Giro [Tue, 17 May 2016 15:52:33 +0000 (16:52 +0100)]
ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Instead of in activity thread. That way, we can warm up (ie,
precompute cached values) this provider and AndroidBCWorkaroundProvider
(which are installed together) so that the computation doesn't
happen in the app. As a result, the time spent in the first call to
SSLSocketFactory.getDefault() decreases by ~5ms in angler userdebug.
Measured with an app calling SSLSocketFactory.getDefault in onCreate
and timed it with System.currentTimeMillis() .

Bug: 28545496

Change-Id: I73284eccdf6d51dbf55206335d759ccf795c5f41

8 years agoMerge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 15:03:33 +0000 (15:03 +0000)]
Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev

8 years agoMerge "Workaround for ignored resizeableActivity param" into nyc-dev
Andrii Kulian [Thu, 19 May 2016 07:57:19 +0000 (07:57 +0000)]
Merge "Workaround for ignored resizeableActivity param" into nyc-dev

8 years agoMerge "Fix build breakage caused by redefining attrs" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 07:06:49 +0000 (07:06 +0000)]
Merge "Fix build breakage caused by redefining attrs" into nyc-dev

8 years agoFix build breakage caused by redefining attrs
Andrii Kulian [Thu, 19 May 2016 02:37:03 +0000 (19:37 -0700)]
Fix build breakage caused by redefining attrs

minWidth and minHeight were already defined without format specified
and we need to have definition without format also. Otherwise they conflict.

Bug: 28775586
Change-Id: I0602bd70d03bdacfc604d884951a60871159ed92

8 years agoMerge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
Erik Kline [Thu, 19 May 2016 04:12:38 +0000 (04:12 +0000)]
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev

8 years agoMerge "Frameworks/base: Optimize LoadedApk" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 03:43:07 +0000 (03:43 +0000)]
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev

8 years agoMerge "Update docs for minWidth/minHeight attributes" into nyc-dev
Andrii Kulian [Thu, 19 May 2016 01:42:13 +0000 (01:42 +0000)]
Merge "Update docs for minWidth/minHeight attributes" into nyc-dev

8 years agoMerge "Rename minWidth/Height attributes" into nyc-dev
Andrii Kulian [Thu, 19 May 2016 01:42:13 +0000 (01:42 +0000)]
Merge "Rename minWidth/Height attributes" into nyc-dev

8 years agoMerge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302
Joe Fernandez [Thu, 19 May 2016 01:25:19 +0000 (01:25 +0000)]
Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302
am: ac9135e737

* commit 'ac9135e737ff53b6e680d9f81dd32012365041b4':
  docs: Add video to Instant Apps landing page

Change-Id: I3c97783703ce80079636f18d4708796b34b351e9

8 years agoMerge "docs: Add video to Instant Apps landing page" into mnc-io-docs
Joe Fernandez [Thu, 19 May 2016 01:20:21 +0000 (01:20 +0000)]
Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs
am: 99ffb30302

* commit '99ffb30302017f00b349369181cbda72c3276170':
  docs: Add video to Instant Apps landing page

Change-Id: Icd8bc9c7d8bbd432889e880eec512c1213baf9af

8 years agoMerge "docs: Add video to Instant Apps landing page" into mnc-io-docs
Joe Fernandez [Thu, 19 May 2016 01:13:22 +0000 (01:13 +0000)]
Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs

8 years agodoc: Updates to release notes post-DP3 am: fd30a43337
Andrew Solovay [Thu, 19 May 2016 01:09:38 +0000 (01:09 +0000)]
doc: Updates to release notes post-DP3 am: fd30a43337
am: 788edcb7ec

* commit '788edcb7ecf03bdabfc8c82cd9949a130c7d2dcc':
  doc: Updates to release notes post-DP3

Change-Id: I656981ca1a6b16e4a429b84abfdc6efad20216cf

8 years agodocs: Add video to Instant Apps landing page
Joe Fernandez [Thu, 19 May 2016 01:07:17 +0000 (18:07 -0700)]
docs: Add video to Instant Apps landing page

b/28842359

Change-Id: Idb097501425ca0a50f547a22f54217878075376a

8 years agodoc: Updates to release notes post-DP3
Andrew Solovay [Thu, 19 May 2016 01:06:20 +0000 (01:06 +0000)]
doc: Updates to release notes post-DP3
am: fd30a43337

* commit 'fd30a43337d31ddcb6925fe275cf0d5cc7a9ed63':
  doc: Updates to release notes post-DP3

Change-Id: If45ef33e3b718649c1c717a9d14613a94f30a839

8 years agoMerge "Fixed a bug where autobundling could lead to bugs" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 00:58:24 +0000 (00:58 +0000)]
Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev

8 years agoWorkaround for ignored resizeableActivity param
Andrii Kulian [Wed, 18 May 2016 02:07:24 +0000 (19:07 -0700)]
Workaround for ignored resizeableActivity param

If <uses-sdk> tag is below <application> in AndroidManifest.xml then,
when activity is parsed, targetSdkVersion param is not yet set correctly.
Because of that we're defaulting to RESIZE_MODE_FORCE_RESIZEABLE and the
param resizeableActivity will be ignored.
This CL checks if resizeableActivity was set explicitly when targetSdkVersion
is less than N (or not set).

Bug: 28020462
Change-Id: I099f6c00dd50547ddea873e47dbb447869d0be6f

8 years agodoc: Updates to release notes post-DP3
Andrew Solovay [Thu, 19 May 2016 00:22:00 +0000 (17:22 -0700)]
doc: Updates to release notes post-DP3

Fixed a mistake (duplicated known-issue) and changed the AfW section
title.

Also added a new adb-related bug in a new "Developer Tools" section.

See first comment for doc stage location.

bug: 28844418
bug: 28347842

Change-Id: I10138a66d596b8aeb5a35a9366950af9f4c7cc51

8 years agoFixed a bug where the chronometer was invisible
Selim Cinek [Thu, 19 May 2016 00:13:46 +0000 (17:13 -0700)]
Fixed a bug where the chronometer was invisible

We were requiring the time to show in order to show the chronomer
which didn't make any sense.

Change-Id: Ia6d00d0932d272a6c5e20e8b41e3acfb53b7987a
Fixes: 28848113

8 years agoMerge "Frameworks/base: Add more systrace points" into nyc-dev
TreeHugger Robot [Thu, 19 May 2016 00:09:07 +0000 (00:09 +0000)]
Merge "Frameworks/base: Add more systrace points" into nyc-dev

8 years agoFixed a bug where the chronometer wasn't updating the time
Selim Cinek [Wed, 18 May 2016 23:59:07 +0000 (16:59 -0700)]
Fixed a bug where the chronometer wasn't updating the time

When the countdown was set to true and the chronometer was set to
count down it wasn't updating the time, which is now fixed.

Change-Id: I4887d9eb09193c5636070edee9ba1bd13b9a23b5
Fixes: 28829131

8 years agoAdd default lock wallpaper capability and API
Christopher Tate [Sat, 7 May 2016 00:59:27 +0000 (17:59 -0700)]
Add default lock wallpaper capability and API

If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery.  In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset.  This mechanism parallels the existing one for
the default system wallpaper.

By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file.  A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.

Bug 27828056

Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7

8 years agoMerge "API feedback: rename JobInfo methods for clarity" into nyc-dev
Chris Tate [Wed, 18 May 2016 23:50:13 +0000 (23:50 +0000)]
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev

8 years agoUpdate BlockedNumberContract javadocs.
Abhijith Shastry [Wed, 18 May 2016 23:20:10 +0000 (16:20 -0700)]
Update BlockedNumberContract javadocs.

Include @return for all public methods.

BUG: 28842525
Change-Id: Ie0fddee1d889f188a77c45d8bdbf78ea9fe323ba

8 years agoMerge "Lock down networking when waiting for always-on" into nyc-dev
Robin Lee [Wed, 18 May 2016 23:37:23 +0000 (23:37 +0000)]
Merge "Lock down networking when waiting for always-on" into nyc-dev

8 years agoFixed a bug where autobundling could lead to bugs
Selim Cinek [Wed, 18 May 2016 22:16:58 +0000 (15:16 -0700)]
Fixed a bug where autobundling could lead to bugs

Notifications could appear twice if a notification with an app
group became bundled and one could not be swiped away anymore.
This is because we were unconditionally copying over the override
key even if the notification just became a group.

This also fixes a nullpointer that could happen with a racecondition
when a notification was cancelled and it tried to be used for autobundling.

This also fixes an issue that the autobundling wasn't working correctly
when a notification didn't have a group set but was set to be a
group summary.

Change-Id: Icd971f16ae0804ce162fd3171fcdd99bd04f3885
Fixes: 28706404
Fixes: 28628237

8 years ago[RenderScript] Fix ScriptIntrinsicBlur documentation.
Miao Wang [Wed, 13 Apr 2016 23:43:10 +0000 (16:43 -0700)]
[RenderScript] Fix ScriptIntrinsicBlur documentation.

Bug: 28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b

8 years agoUpdate documentation about copyTo and copyFrom.
Miao Wang [Fri, 1 Apr 2016 22:10:47 +0000 (15:10 -0700)]
Update documentation about copyTo and copyFrom.

Bug: 23159764
Bug: 26862970

  - Add detailed description of AutoPadding
  - Add comments to all the copy related APIs.
  - Fix typos in the comments.

Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9

8 years agoLock down networking when waiting for always-on
Robin Lee [Mon, 9 May 2016 12:46:28 +0000 (13:46 +0100)]
Lock down networking when waiting for always-on

Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa

8 years agoupdate sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d
smain@google.com [Wed, 18 May 2016 22:59:45 +0000 (22:59 +0000)]
update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d
am: 9de1d192af

* commit '9de1d192af5761dec4e58837690febc6385874b4':
  update sdk/ link to studio/

Change-Id: I3184c8b697fe96162cb87c17bcf85fc6375127d9

8 years agoMerge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs...
Bert McMeen [Wed, 18 May 2016 22:59:36 +0000 (22:59 +0000)]
Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9
am: 3fb62d859f

* commit '3fb62d859f2c3ed0b06dd3d6f7183c838c829c2b':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I3ad08bb522e3c1ab2fefd2cf7884d69d82f5d394

8 years agoupdate sdk/ link to studio/ am: 04de2d285e
smain@google.com [Wed, 18 May 2016 22:54:47 +0000 (22:54 +0000)]
update sdk/ link to studio/ am: 04de2d285e
am: 2e28ebfc1d

* commit '2e28ebfc1d4ef357968923fc763d1f87ea389ef6':
  update sdk/ link to studio/

Change-Id: I2180d895901a935aa0ebf46cdbfc7b7ab8d2b23e

8 years agoMerge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs
Bert McMeen [Wed, 18 May 2016 22:54:43 +0000 (22:54 +0000)]
Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs
am: 58fdf82ab9

* commit '58fdf82ab9c21fb6fd3d1d64e1d2c13abb670ba1':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I0a158cce412a6973b607c2002a490ffa37e72f59