Sergio Giro
cfc00030cc
resolve merge conflicts of 882c7d2 to master
...
Change-Id: I1235236c405e46fc984c7dda743fc6815ba7aab9
2016-05-19 22:11:37 +01:00
Sergio Giro
882c7d244c
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c
...
am: 3eb0680642
2016-05-19 18:21:50 +00:00
Sergio Giro
3eb0680642
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev
...
am: 44b9f13f9c
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
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
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
2016-05-19 15:12:30 +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
2016-05-19 08:12:56 +00:00
Andrii Kulian
e78cbe1770
Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb
...
am: 6b21f45add
2016-05-19 08:09:07 +00:00
Andrii Kulian
6b21f45add
Merge "Workaround for ignored resizeableActivity param" into nyc-dev
...
am: 005f9a73fb
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
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
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
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
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
2016-05-19 04:00:15 +00:00
Andreas Gampe
36061b85ff
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c
...
am: 3fbf298984
2016-05-19 03:55:17 +00:00
Andreas Gampe
3fbf298984
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev
...
am: 8cb3b2bb5c
2016-05-19 03:51:39 +00:00
Andreas Gampe
fcbc43b70a
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev
...
am: 8cb3b2bb5c
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
ebf7a56e69
Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 am: 81ce16a2e6
...
am: c59e70d520
2016-05-19 02:00:50 +00:00
Andrii Kulian
c59e70d520
Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3
...
am: 81ce16a2e6
2016-05-19 01:53:09 +00:00
Andrii Kulian
1699b51cbe
Merge "Rename minWidth/Height attributes" into nyc-dev
...
am: 42b3acf9d3
2016-05-19 01:48:29 +00:00
Andrii Kulian
81ce16a2e6
Merge "Rename minWidth/Height attributes" into nyc-dev
...
am: 42b3acf9d3
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
90e4bf8b0f
Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad am: 54748384ea
...
am: f466f7bbd5
2016-05-19 00:23:53 +00:00
Christopher Tate
d3d1a915fa
Add default lock wallpaper capability and API am: 5d99d47f39 am: 8d71edc83d
...
am: 3f42e0a3f3
2016-05-19 00:19:55 +00:00
Andreas Gampe
f466f7bbd5
Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad
...
am: 54748384ea
2016-05-19 00:19:48 +00:00
Andreas Gampe
e289467a1e
Merge "Frameworks/base: Add more systrace points" into nyc-dev
...
am: b40bcfb6ad
2016-05-19 00:18:58 +00:00
Andreas Gampe
54748384ea
Merge "Frameworks/base: Add more systrace points" into nyc-dev
...
am: b40bcfb6ad
2016-05-19 00:14:14 +00:00
Christopher Tate
c79333d873
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: c5bbf34cd9
...
am: 4b8088ea8d
2016-05-19 00:13:17 +00:00
Christopher Tate
3f42e0a3f3
Add default lock wallpaper capability and API am: 5d99d47f39
...
am: 8d71edc83d
2016-05-19 00:13:04 +00:00
Christopher Tate
d688617d4f
Add default lock wallpaper capability and API
...
am: 5d99d47f39
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
2016-05-19 00:03:45 +00:00
Christopher Tate
d8843b7f68
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
...
am: b100777562
2016-05-19 00:03:17 +00:00
Christopher Tate
8d71edc83d
Add default lock wallpaper capability and API
...
am: 5d99d47f39
2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
...
am: b100777562
2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39
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
2016-05-18 23:57:46 +00:00
Robin Lee
24f7b92a3c
Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e am: 77ab7fc8d4
...
am: 22e9213a1c
2016-05-18 23:53:25 +00:00
Chris Tate
b100777562
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
2016-05-18 23:50:14 +00:00
Robin Lee
22e9213a1c
Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e
...
am: 77ab7fc8d4
2016-05-18 23:47:52 +00:00
Robin Lee
77ab7fc8d4
Merge "Lock down networking when waiting for always-on" into nyc-dev
...
am: d171df660e
2016-05-18 23:42:43 +00:00
Robin Lee
43fbfbf94c
Merge "Lock down networking when waiting for always-on" into nyc-dev
...
am: d171df660e
2016-05-18 23:42:40 +00:00
Robin Lee
d171df660e
Merge "Lock down networking when waiting for always-on" into nyc-dev
2016-05-18 23:37:24 +00:00
Robin Lee
17e6183b85
Lock down networking when waiting for always-on
...
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
2016-05-19 00:26:53 +01:00
