Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
262,665 Commits 3 Branches 0 Tags
1ec2fd72cea31d46cca6e8f6686115fabe885664
Commit Graph

60698 Commits

Author SHA1 Message Date
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff' 
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
 2016-05-19 23:51:32 +00:00
Abhijith Shastry
4ced2b0732 Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813 
am: 99d1fd935e

* commit '99d1fd935e7d8c8f3b27c41d1a7ebe7ffa0dbe63':
  Update BlockedNumberContract javadocs.

Change-Id: I7bf4ac0a54b69fb2c4084eeac3de2f7de94b102a
 2016-05-19 22:50:34 +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
Abhijith Shastry
07abc7f813 Merge "Update BlockedNumberContract javadocs." into nyc-dev 2016-05-19 22:43:12 +00:00
Phil Weaver
ea45ad0c08 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d 
am: f2b72b3a9d

* commit 'f2b72b3a9d1576da77cfe1f7c38648c2c4e90314':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ic796c5149995c616e3d57b9ebf1f6d9f288dc07c
 2016-05-19 22:04:01 +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
Sergio Giro
cfc00030cc resolve merge conflicts of 882c7d2 to master 
Change-Id: I1235236c405e46fc984c7dda743fc6815ba7aab9
 2016-05-19 22:11:37 +01:00
Selim Cinek
e934d32862 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89 
am: e9b32c77f8

* commit 'e9b32c77f88a2acb7e7e23fbd14f6b4f373cba0b':
  Fixed a bug where the chronometer was invisible

Change-Id: Ie6f36bca7345f7b1f86425e993deb7d617bbc4d5
 2016-05-19 20:54:37 +00:00
Selim Cinek
0f27eeba1b Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev am: 0676196be2 
am: 8e8aa4ec4d

* commit '8e8aa4ec4daa5ac46e9be921bc0dd34f812e1a97':
  Fixed a bug where the chronometer wasn't updating the time

Change-Id: Ibaf35c283513973a22dee6eb601493b01a5de573
 2016-05-19 20:50:20 +00: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
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
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
Sungki Kim
77def887c6 Merge "Fix GATT autoConnect race condition" into nyc-dev am: ddd7d3d766 
am: 22665c943b

* commit '22665c943b9a7d55c632c1bfefecc2c1a32dea61':
  Fix GATT autoConnect race condition

Change-Id: I3688588e3d00ca3a1fb3f19a2ad6a761d906b52b
 2016-05-19 19:49:30 +00: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
Sungki Kim
22665c943b Merge "Fix GATT autoConnect race condition" into nyc-dev 
am: ddd7d3d766

* commit 'ddd7d3d766744125b1bd3033f12e54b26a1d4068':
  Fix GATT autoConnect race condition

Change-Id: I19dfdf3c52bf90d7e1541716cd63d5aa9d73700d
 2016-05-19 19:44:44 +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
Chris Tate
2467a7fe90 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev am: 9d37bdcb91 
am: 3de573733c

* commit '3de573733c05d204589d9c56fb26fbb985ecc060':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I7cbca080286f54040782c79eab57f2285cee222d
 2016-05-19 19:44:15 +00:00
TreeHugger Robot
ddd7d3d766 Merge "Fix GATT autoConnect race condition" into nyc-dev 2016-05-19 19:38:56 +00:00
Christopher Tate
3de573733c Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: Iea24b4a97c72248c185f8756b8b74b8b60f3c05f
 2016-05-19 19:38:48 +00:00
Chris Tate
9d37bdcb91 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 2016-05-19 19:34:08 +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
Sergio Giro
882c7d244c Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c 
am: 3eb0680642

* commit '3eb06806429f444fe87b894308681e20e6871c7d':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia3c21577450bc028548e8427a4a0f9f552e4890f
 2016-05-19 18:21:50 +00:00
Sergio Giro
14c9a306ad Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev 
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: I22e0d3b3967ad205e0e9aad328790e907335ed17
 2016-05-19 18:10:04 +00:00
Sergio Giro
3eb0680642 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev 
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia20b312dfd8181fadd38f075817630a1c5ab518f
 2016-05-19 18:09:30 +00:00
Sergio Giro
44b9f13f9c Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev 2016-05-19 17:53:00 +00:00
Christopher Tate
98d609ce3f 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
 2016-05-19 10:33:22 -07:00
Ian Rogers
63f289a8a1 Merge "Fix bug where FileUtils.deleteOlderFiles wouldn't delete the oldest files." 2016-05-19 16:59:10 +00:00
Sergio Giro
69de32071c 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
 2016-05-19 16:42:19 +00:00
Michael Wright
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: 1831ca8f04

* commit '1831ca8f04e117a49227e1b3dc0c8ba1dde06cd5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
 2016-05-19 15:23:45 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
 2016-05-19 15:12:30 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
 2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Andrii Kulian
5a3ff14225 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: 6b21f45add 
am: e78cbe1770

* commit 'e78cbe1770ffee7d9f24c8f1126fb1592c9ad1c3':
  Workaround for ignored resizeableActivity param

Change-Id: I36d934ec2aea69156680d9b9e55584ce12d76b60
 2016-05-19 08:12:56 +00:00
Andrii Kulian
e78cbe1770 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb 
am: 6b21f45add

* commit '6b21f45add49cdacaad9e75cbba332fa3b63522c':
  Workaround for ignored resizeableActivity param

Change-Id: Ia8dc3606ff13b1358d657a8280820ed542cb4781
 2016-05-19 08:09:07 +00:00
Andrii Kulian
6b21f45add Merge "Workaround for ignored resizeableActivity param" into nyc-dev 
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: Ia524867cac9118b6dbe5c7c210cd1a1753fe53e1
 2016-05-19 08:06:02 +00:00
Andrii Kulian
ede05733f0 Merge "Workaround for ignored resizeableActivity param" into nyc-dev 
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: I93844e807cbedc50b26f98916fe3e79e0ef9afa2
 2016-05-19 08:06:02 +00:00
Andrii Kulian
005f9a73fb Merge "Workaround for ignored resizeableActivity param" into nyc-dev 2016-05-19 07:57:20 +00:00
Erik Kline
f26088c8c2 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb am: 8958153ac7 
am: f99efa7e75

* commit 'f99efa7e758e00101fbc19be68b8552a946c21a3':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I4a0be195dab4525258b455330ce6212987b0e6c0
 2016-05-19 04:27:26 +00:00
Erik Kline
f99efa7e75 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
 2016-05-19 04:24:16 +00:00
Erik Kline
ae53fb4a43 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
 2016-05-19 04:21:17 +00:00
Erik Kline
8958153ac7 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I10ed64f309794ed7a18e16f22fa75bc63707998c
 2016-05-19 04:21:15 +00:00
Erik Kline
c21f84dddb Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Andreas Gampe
059db73b1f Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: 3fbf298984 
am: 36061b85ff

* commit '36061b85ff3776c4df57b1ea42c7059234585be7':
  Frameworks/base: Optimize LoadedApk

Change-Id: I894cf7dc97eaa6ddaec758cb7731803e173209ca
 2016-05-19 04:00:15 +00:00
Andreas Gampe
36061b85ff Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c 
am: 3fbf298984

* commit '3fbf29898459d3b6d9fa1680c02650fd692c32e6':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id57874836bd9a4e13b57cad2fdc1ff28d6a8f19c
 2016-05-19 03:55:17 +00:00
Andreas Gampe
3fbf298984 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id11e7e9114403ab70c83601f1988f098d5728a5b
 2016-05-19 03:51:39 +00:00
Andreas Gampe
fcbc43b70a Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: I3cefc230805bc11051acbf3b92382be2aa8dd273
 2016-05-19 03:51:37 +00:00