Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,182 Commits 3 Branches 0 Tags
00725f1d65c2db7ee5eda48c5dc683bcfcf885ce
Commit Graph

249182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-Hung Hsieh
0a87059452 resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp 
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
 2016-05-19 16:22:09 -07:00
Dirk Dougherty
f339170837 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
 2016-05-19 23:19:12 +00:00
Dirk Dougherty
8053c79246 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 
am: 5fb577e6bc

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

Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
 2016-05-19 23:13:57 +00:00
John Reck
93510f46e0 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: I753de859a133ded85cb89fb914bbe29e195a3432
 2016-05-19 23:07:15 +00:00
Dirk Dougherty
5fb577e6bc Merge "Remove outdated google services links." into mnc-mr-docs 
am: dc40b80ae9

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

Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
 2016-05-19 23:07:10 +00:00
Chih-Hung Hsieh
404e2b21fc Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni." 
am: e66235bf00

* commit 'e66235bf00a695cacb44b0bc1a241cabb7de3b96':
  Fix misc-macro-parentheses warnings in hwui and graphic jni.

Change-Id: I08ab0efc29e8b595f087a781d8a66a472f1f9797
 2016-05-19 23:07:09 +00:00
Treehugger Robot
e66235bf00 Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni." 2016-05-19 23:02:55 +00:00
Dirk Dougherty
dc40b80ae9 Merge "Remove outdated google services links." into mnc-mr-docs 2016-05-19 23:01:54 +00:00
Dirk Dougherty
8b35261e90 Remove outdated google services links. 
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
 2016-05-19 16:00:56 -07: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
bf5dd7b969 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: Iacc8d86b622f2ecf46625fdf9d12b31dca78655e
 2016-05-19 22:56:34 +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
99d1fd935e Merge "Update BlockedNumberContract javadocs." into nyc-dev 
am: 07abc7f813

* commit '07abc7f8139e012f8a92d74448db357446ab4664':
  Update BlockedNumberContract javadocs.

Change-Id: Id8d90f28d56223ab1d01be634e83df2ee4dd9e93
 2016-05-19 22:46:57 +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
Hemal Patel
b40e1aa065 Docs: Fixed a typo 
Bug: 27583289
Change-Id: Ice0208182d98bb9e55343a915907c2b86a0bba65
 2016-05-19 15:36:09 -07: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
Chih-Hung Hsieh
6c89616c38 Fix misc-macro-parentheses warnings in services jni. 
Bug: 28705665
Change-Id: Iaf965875b667e45e1557e447de7988f729adfd52
 2016-05-19 15:29:38 -07: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
Chih-Hung Hsieh
cef190de85 Fix misc-macro-parentheses warnings in hwui and graphic jni. 
Bug: 28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
 2016-05-19 15:25:50 -07:00
Miao Wang
35927794fc Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev 
am: 75445fd6a0

* commit '75445fd6a043a892bb7d7f18c1d62c5f72337413':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: I8ccd115fd6f92ef4b4ef7194a77fd01ffbda5916
 2016-05-19 22:24:27 +00:00
Miao Wang
7ae30e18a4 Merge "Update documentation about copyTo and copyFrom." into nyc-dev 
am: 1a523b7502

* commit '1a523b7502135a5cc0a94ea380263638b0ffdab1':
  Update documentation about copyTo and copyFrom.

Change-Id: I0aa87cd4bde408ba5395ae3f951d86e10ece58de
 2016-05-19 22:24:21 +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
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw. 
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
 2016-05-19 15:19:22 -07: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
Robert Carr
692a5feab9 Correctly clear resizing drawable when nulling background. 
When a null window background is set, we want to use the
fallback drawable for resizing.

Bug: 28801472

Change-Id: Ia616d7aa18b0d7aa2c7081a85ce7551ecfeca5b3
 2016-05-19 15:11:14 -07:00
Andre Eisenbach
51ab612ea9 Merge "Fix GATT autoConnect race condition" am: 53ccfe848f 
am: 5dfe673be1

* commit '5dfe673be19ec469b1e62f4713c24f57b5ff27e2':
  Fix GATT autoConnect race condition

Change-Id: I236ba945e17ab8ba960d18a8225ff65f170180e0
 2016-05-19 22:10:07 +00:00
smain@google.com
0f150a6901 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
 2016-05-19 15:08:51 -07:00
Sungki Kim
5dfe673be1 Merge "Fix GATT autoConnect race condition" 
am: 53ccfe848f

* commit '53ccfe848f1b97cca12c7e5b496032e97594a8e2':
  Fix GATT autoConnect race condition

Change-Id: Ia761a72b003751146b83314facfdaf936b1f9e9b
 2016-05-19 22:05:49 +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
Andre Eisenbach
53ccfe848f Merge "Fix GATT autoConnect race condition" 2016-05-19 21:59:25 +00:00
Phil Weaver
f2b72b3a9d 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: Ie5bfa1fcee7ec463190ef73311f20f3a6f087e82
 2016-05-19 21:57:12 +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
7b5f5c3188 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: Ifa2e3879a01f7ba906185b00d4b27ed3843dd315
 2016-05-19 21:46:07 +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
Jae Seo
bd6c16908d MediaBrowserService: Add more explanation on getBrowserRootHints() 
Bug: 28840985
Change-Id: If4dbcaaa23093b2e6d5ab6158db67b1248464fb8
 2016-05-19 14:17:27 -07:00
Hemal Patel
a1ed45d7c8 Docs: Fixed a wrong file name 
Bug: 26897599
Change-Id: I4a0bb6149e6a88bb9eda90b8bcc44909633f8399
 2016-05-19 14:13:29 -07:00
Selim Cinek
e9b32c77f8 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: I8caf83fdb4a27e477e644123d349bc4951eda0dd
 2016-05-19 20:49:24 +00:00
Vincent Palatin
a0116bf81f Fix notifications for USB PD enabled devices 
The devices with USB PD support can have the data role and the power role of
their USB-C port reversed. Ensure the title of the notification and the content
of the USB selection dialog is correct in this case.

Testing done on Ryu with the following accessories:
- legacy A-C cable
- USB-C charger (5X)
- USB-PD charger (Zinger)
- Pixel 2 (in both roles)
- Type-C Macbook (in both roles)
- Nexus 5X (in both roles)
- Apple AV HDMI accessory
- LG USB-C screen/dock
- Honeybuns dock

Bug: 28310685
Bug: 24137353
Change-Id: Id7f358c40d8714fae68ca98a7eb067f62f18b0af
(cherry picked from commit 0be6800b0f)
 2016-05-19 20:46:21 +00:00
Selim Cinek
b521c107ed 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: Idd72e636e42f59a17445694b4c4c97b47bf58e71
 2016-05-19 20:45:18 +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