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
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
0676196be2
Merge "Fixed a bug where the chronometer wasn't updating the time" into nyc-dev
2016-05-19 20:39:34 +00: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
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
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
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
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
TreeHugger Robot
8cb3b2bb5c
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev
2016-05-19 03:43:08 +00:00
Andrii Kulian
c59e70d520
Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3
...
am: 81ce16a2e6
* commit '81ce16a2e690fbe808ae4546e0c9b814a7ff2e3d':
Rename minWidth/Height attributes
Change-Id: I927c32ddf2522de03c6b5a75aa6b80537adf1d38
2016-05-19 01:53:09 +00:00
Andrii Kulian
1699b51cbe
Merge "Rename minWidth/Height attributes" into nyc-dev
...
am: 42b3acf9d3
* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
Rename minWidth/Height attributes
Change-Id: Id7d89884ea46b3900459af10f5b4a4b32139ddd8
2016-05-19 01:48:29 +00:00
Andrii Kulian
81ce16a2e6
Merge "Rename minWidth/Height attributes" into nyc-dev
...
am: 42b3acf9d3
* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
Rename minWidth/Height attributes
Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
2016-05-19 01:48:19 +00:00
Andrii Kulian
42b3acf9d3
Merge "Rename minWidth/Height attributes" into nyc-dev
2016-05-19 01:42:15 +00:00
Andrii Kulian
3f8dc15861
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
2016-05-18 17:49:26 -07:00
Andreas Gampe
f466f7bbd5
Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad
...
am: 54748384ea
* commit '54748384ea3e001cbc97ecdf67501c8592925df7':
Frameworks/base: Add more systrace points
Change-Id: I4a3b4143a87c5e928d7149d57a899af0c0aecb0b
2016-05-19 00:19:48 +00:00
Andreas Gampe
e289467a1e
Merge "Frameworks/base: Add more systrace points" into nyc-dev
...
am: b40bcfb6ad
* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
Frameworks/base: Add more systrace points
Change-Id: Id090c0545a17beb45bafd05f5302298e09ea30cd
2016-05-19 00:18:58 +00:00
Andreas Gampe
54748384ea
Merge "Frameworks/base: Add more systrace points" into nyc-dev
...
am: b40bcfb6ad
* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
Frameworks/base: Add more systrace points
Change-Id: I1ede493eaab4a86c67a992c2eb4129f81d903d1c
2016-05-19 00:14:14 +00:00
Christopher Tate
3f42e0a3f3
Add default lock wallpaper capability and API am: 5d99d47f39
...
am: 8d71edc83d
* commit '8d71edc83de3c695f27967dd3378306654b9953c':
Add default lock wallpaper capability and API
Change-Id: I676d2ab9526f9e2e47f79a73cbb680673ded50f0
2016-05-19 00:13:04 +00:00
Christopher Tate
d688617d4f
Add default lock wallpaper capability and API
...
am: 5d99d47f39
* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
Add default lock wallpaper capability and API
Change-Id: Idf6c51153920e3209b2c86b892c399375c48f721
2016-05-19 00:11:53 +00:00
TreeHugger Robot
b40bcfb6ad
Merge "Frameworks/base: Add more systrace points" into nyc-dev
2016-05-19 00:09:09 +00:00
Chris Tate
4b8088ea8d
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562
...
am: c5bbf34cd9
* commit 'c5bbf34cd940f8fa62662bec3a71f7160983dc06':
API feedback: rename JobInfo methods for clarity
Change-Id: I4b97e2f581ce0c36d1385a510916b4ad3bc4e1af
2016-05-19 00:03:45 +00:00
Christopher Tate
d8843b7f68
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
...
am: b100777562
* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
API feedback: rename JobInfo methods for clarity
Change-Id: I2aad59e4126f2025b98051cc348e73be282aad5d
2016-05-19 00:03:17 +00:00
Christopher Tate
8d71edc83d
Add default lock wallpaper capability and API
...
am: 5d99d47f39
* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
Add default lock wallpaper capability and API
Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
2016-05-19 00:02:47 +00:00
Selim Cinek
a2a0171e7c
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
2016-05-18 16:59:07 -07:00
Christopher Tate
c5bbf34cd9
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
...
am: b100777562
* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
API feedback: rename JobInfo methods for clarity
Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
2016-05-18 23:58:03 +00:00