John Reck
3a3973d263
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
...
am: 02b5805ba3
* commit '02b5805ba3f5567ef6eea5931f120fd261cd4a54':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Id1ae8b8ead92837ef43e9e40aeac8696fe8a6e76
2016-05-19 23:06:25 +00:00
John Reck
02b5805ba3
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
2016-05-19 22:59:26 +00:00
Bert McMeen
00df4e8cf3
docs: Update to column widths for Complications table am: 76372f02fe am: 4cdad3212e
...
am: 8386df9ea1
* commit '8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
docs: Update to column widths for Complications table
Change-Id: I9a282a4b7f4b75ea6b51939afc516960bb690161
2016-05-19 22:57:08 +00:00
John Reck
7298186769
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
2016-05-19 22:54:05 +00:00
John Reck
08a4808197
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
2016-05-19 22:50:55 +00:00
Bert McMeen
8386df9ea1
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
2016-05-19 22:50:53 +00:00
John Reck
0f59d9b80c
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
2016-05-19 22:47:05 +00:00
Abhijith Shastry
cd44b983fe
Merge "Update BlockedNumberContract javadocs." into nyc-dev
...
am: 07abc7f813
* commit '07abc7f8139e012f8a92d74448db357446ab4664':
Update BlockedNumberContract javadocs.
Change-Id: I88cd7749894dc531fb793e800528af7a686076f5
2016-05-19 22:46:55 +00:00
Bert McMeen
4cdad3212e
docs: Update to column widths for Complications table
...
am: 76372f02fe
* commit '76372f02fe149aefccea502bf1ac0dca2693e84b':
docs: Update to column widths for Complications table
Change-Id: I67578fd73f26af6ef2187e4e9823fb71e89f990e
2016-05-19 22:44:13 +00:00
John Reck
a7895725f8
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
2016-05-19 22:43:14 +00:00
Abhijith Shastry
07abc7f813
Merge "Update BlockedNumberContract javadocs." into nyc-dev
2016-05-19 22:43:12 +00:00
John Reck
8238207ce6
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
2016-05-19 22:37:04 +00:00
John Reck
1da8c9baa2
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
2016-05-19 22:32:47 +00:00
John Reck
1fae3b370d
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
2016-05-19 22:28:23 +00:00
Miao Wang
41f6d98d61
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev
...
am: 75445fd6a0
* commit '75445fd6a043a892bb7d7f18c1d62c5f72337413':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: I052720b2df509ad33ab107e8aae3b38e2499e72c
2016-05-19 22:24:36 +00:00
Miao Wang
34abcb758b
Merge "Update documentation about copyTo and copyFrom." into nyc-dev
...
am: 1a523b7502
* commit '1a523b7502135a5cc0a94ea380263638b0ffdab1':
Update documentation about copyTo and copyFrom.
Change-Id: I7dab75f163e4dc3826cf864fbe61546fae6a3f7a
2016-05-19 22:24:31 +00:00
John Reck
bfa719f448
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
2016-05-19 22:21:46 +00:00
Miao Wang
75445fd6a0
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev
2016-05-19 22:16:55 +00:00
John Reck
5527fd1323
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
2016-05-19 22:16:42 +00:00
Miao Wang
1a523b7502
Merge "Update documentation about copyTo and copyFrom." into nyc-dev
2016-05-19 22:16:38 +00:00
Bert McMeen
76372f02fe
docs: Update to column widths for Complications table
...
Bug: 28864917
Change-Id: Ie02b5dd82789055b2a0994438065fc373ddf70b6
2016-05-19 15:01:38 -07:00
Phil Weaver
df5056d531
Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
...
am: 227d33439d
* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
Fix a11y crash when window layer isn't unique.
Change-Id: I943fbc2e585ea6aaa234965dacacbf88104944a1
2016-05-19 21:57:55 +00:00
Phil Weaver
227d33439d
Merge "Fix a11y crash when window layer isn't unique." into nyc-dev
2016-05-19 21:50:29 +00:00
Robert Carr
1b3e08b4d1
Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev
...
am: 1669d42808
* commit '1669d42808251eebddfe5e176eb8d322b84df636':
Never set resized while not drag resizing for pinned stack.
Change-Id: I5da72476c63c5f368e7ff8c1269308d206761ffd
2016-05-19 21:45:58 +00:00
TreeHugger Robot
1669d42808
Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev
2016-05-19 21:42:21 +00:00
Damien Bargiacchi
96783005d7
Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev
2016-05-19 20:56:52 +00:00
Damien Bargiacchi
9cb24e5582
Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev
2016-05-19 20:56:52 +00:00
Selim Cinek
b9d4cd81a3
Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
...
am: 2486cb2c89
* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
Fixed a bug where the chronometer was invisible
Change-Id: Ib495f096b5b2bc758ce7224fae33ba1a44c027a2
2016-05-19 20:51:04 +00:00
Selim Cinek
8e8aa4ec4d
Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev
...
am: 0676196be2
* commit '0676196be2657fdf265fa7ad1eae3eecf1bbfebc':
Fixed a bug where the chronometer wasn't updating the time
Change-Id: I16327b27bcfce8eaeb18cbddd420bb134cff1e45
2016-05-19 20:45:20 +00:00
TreeHugger Robot
2486cb2c89
Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
2016-05-19 20:40:26 +00:00
TreeHugger Robot
0676196be2
Merge "Fixed a bug where the chronometer wasn't updating the time" into nyc-dev
2016-05-19 20:39:34 +00:00
Phil Weaver
adaafb2980
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
2016-05-19 13:32:24 -07:00
Steve McKay
a1f7505fb6
Merge "Fix RTL issue in delete dialog." into nyc-dev
...
am: 7b5327fb67
* commit '7b5327fb67765769adc6cb0b2de21034a30cf24d':
Fix RTL issue in delete dialog.
Change-Id: Ic55b0e756df55859318ae748073b0c85c3cade3e
2016-05-19 20:31:46 +00:00
TreeHugger Robot
7b5327fb67
Merge "Fix RTL issue in delete dialog." into nyc-dev
2016-05-19 20:24:35 +00:00
Robert Carr
031384556e
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
2016-05-19 13:19:53 -07:00
Sungki Kim
b0eab23516
Merge "Fix GATT autoConnect race condition" into nyc-dev
...
am: ddd7d3d766
* commit 'ddd7d3d766744125b1bd3033f12e54b26a1d4068':
Fix GATT autoConnect race condition
Change-Id: Ibd668dcd22c1c1f17835ee05bcd175024a6487e5
2016-05-19 19:46:03 +00:00
Christopher Tate
2b2ad77fdb
Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev
...
am: 9d37bdcb91
* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
Incorporate feedback on new wallpaper-related APIs
Change-Id: I0dce83effbb05d52e2bcfb6f0ff48badbab71655
2016-05-19 19:44:42 +00:00
TreeHugger Robot
ddd7d3d766
Merge "Fix GATT autoConnect race condition" into nyc-dev
2016-05-19 19:38:56 +00:00
Chris Tate
9d37bdcb91
Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev
2016-05-19 19:34:08 +00:00
John Reck
1b1fcbaab5
DO NOT MERGE Cherry pick libpng usage fixes
...
am: 7c9f2b8aa2
* commit '7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a
2016-05-19 19:26:24 +00:00
Chris Craik
d390a7da12
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
...
am: a4316e962c
* commit 'a4316e962c8f22f1adf7eca4763b2a29e4286846':
Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"
Change-Id: If25fa93d13377cdd6d9cd9aa1c6f0e77bfe4352b
2016-05-19 18:50:09 +00:00
Wyatt Riley
2f052f8e94
Merge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev
...
am: b5b03bc450
* commit 'b5b03bc450235ffa85ac636da460b61f1e99bff1':
Mapping up/down of legacy Gps vs. Gnss Status
Change-Id: I2ff6c7714ecca01cb75176452cdbd2ec969fc937
2016-05-19 18:49:30 +00:00
Chris Craik
a4316e962c
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
2016-05-19 18:45:25 +00:00
Wyatt Riley
b5b03bc450
Merge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev
2016-05-19 18:37:54 +00:00
Chris Craik
6badb0fb54
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
2016-05-19 18:35:30 +00:00
Sanket Agarwal
9d2441369b
While turning OFF do not honor ON requests.
...
am: 090bf55130
* commit '090bf551308e68b1b2a996c959b608cabd025c5c':
While turning OFF do not honor ON requests.
Change-Id: I528c640a9bc482fbbec3b11eef6569c93a632b76
2016-05-19 18:32:24 +00:00
Chris Craik
f7688a4f29
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
2016-05-19 18:31:33 +00:00
Sanket Agarwal
090bf55130
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
2016-05-19 18:27:27 +00:00
Sungki Kim
d35167adca
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
2016-05-19 18:25:25 +00:00
Steve McKay
78951ad998
Fix RTL issue in delete dialog.
...
Bug:28772371
Change-Id: Ia5d3e074ac40b73f21cc83f507735d0918799966
2016-05-19 11:21:41 -07:00