Commit Graph

6525 Commits

Author SHA1 Message Date
Neil Fuller
2be22e0d85 Merge "Add support for ICU data pinning in the Zygote" am: 9b1d64410d am: 8491b4c05d am: c724f2207f
am: a90127dcc8

* commit 'a90127dcc8b5d1b9a7eb7a1c1d5eed9c87eb36ed':
  Add support for ICU data pinning in the Zygote

Change-Id: I444be1abe083b84a7d411f87ff9a6865e96344ff
2016-05-18 12:03:12 +00:00
Neil Fuller
a90127dcc8 Merge "Add support for ICU data pinning in the Zygote" am: 9b1d64410d am: 8491b4c05d
am: c724f2207f

* commit 'c724f2207f9186f25eeac5b2131e469dafb3bc90':
  Add support for ICU data pinning in the Zygote

Change-Id: I2c14d6dad84ed2bf5d6186ab795d54184bb483cb
2016-05-18 12:00:34 +00:00
Neil Fuller
c724f2207f Merge "Add support for ICU data pinning in the Zygote" am: 9b1d64410d
am: 8491b4c05d

* commit '8491b4c05d35b15e0a4c1a0ef2396cbb7169698a':
  Add support for ICU data pinning in the Zygote

Change-Id: I64ba8a96ab8990a051a68cbdb35f4b1de3738d09
2016-05-18 11:55:44 +00:00
Neil Fuller
8491b4c05d Merge "Add support for ICU data pinning in the Zygote"
am: 9b1d64410d

* commit '9b1d64410dfddc38ade15d1581de2c89ad79948a':
  Add support for ICU data pinning in the Zygote

Change-Id: I53a2d5f885df5cf633a4a63cb2e3c2bc5c75959e
2016-05-18 11:51:05 +00:00
Neil Fuller
41c9dc3b69 Add support for ICU data pinning in the Zygote
Upstream ICU caches use SoftReferences. On Android this means
that useful cached data initialized in the Zygote are "lost" when
the Zygote GCs and cannot be shared with apps. This change makes use
of an Android patch to ICU to ensure References created during
Zygote initialization are "strong". i.e. they are never collected.
This prevents them being GCd and ensures they can be shared between
applications.

After switching ICU to use strong references, this change
also creates DecimalFormatSymbols objects for common ULocales
(ROOT, US and the user's default, if different). DecimalFormatSymbols
makes use of an ICU Reference cache and this alone has been shown to
improve the construction time of java.text.DecimalFormat by 1-1.5
milliseconds on a Seed device. This saving applies the first time one
is created in each app for each locale, and again if SoftReferences
have been cleared.

The cost to the heap size of the Zygote has been measured at ~107k.
This value will change as more caches are switched to use the new
CacheValue class.

Formatting is typically performed on the UI thread and the intention
of this change is to reduce app start up time and jank in apps like
the Dialer which do a lot of formatting when scrolling lists. The
change may also enable more virtual memory page-sharing between
apps, though this is not the specific goal.

Bug: 28326526
Change-Id: Ia2c73f6525f05b1aa81e57a31eed1616decf6bb5
2016-05-18 11:15:11 +01:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
2016-05-18 02:25:10 +00:00
Yohei Yukawa
bf4c8f730b Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
am: ddaf3f4681

* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
  Move LocaleList to avoid layering violation.

Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Joe Onorato
160d5c57cf Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 am: 6b10cec210
am: 269f64079b

* commit '269f64079b34eb178a33dba306d610c8dfb322c4':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: I9d6419d9c587eaca1577cef82a1ec054a6bb3d6c
2016-05-18 00:55:42 +00:00
Joe Onorato
269f64079b Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373
am: 6b10cec210

* commit '6b10cec2108746e15388125fdd6fa0cbfd6cb28d':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ifc94199cc5ad69af73871cc012aa2dac31b6f67b
2016-05-18 00:52:32 +00:00
Joe Onorato
6b10cec210 Merge changes If51568c3,Idd434c19 into nyc-dev
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8
2016-05-18 00:49:54 +00:00
TreeHugger Robot
45165c9373 Merge changes If51568c3,Idd434c19 into nyc-dev
* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from
2016-05-18 00:46:47 +00:00
Jorim Jaggi
7c81d495b6 Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b am: e48384c867
am: 22507e99ff

* commit '22507e99ff289b20caa647fad0ca3b637ee0f14e':
  Fix threading problems with drawables

Change-Id: I06fa9ebcdd1c0b0006ecc8f4481fcf45a3f5f8fa
2016-05-18 00:39:39 +00:00
Jorim Jaggi
22507e99ff Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b
am: e48384c867

* commit 'e48384c8672f53b00b231a7590f45650f1e3f22e':
  Fix threading problems with drawables

Change-Id: Icad4ab1e6f497ab1c549b2d0bb1720c13f6254c2
2016-05-18 00:33:59 +00:00
Jorim Jaggi
e48384c867 Merge "Fix threading problems with drawables" into nyc-dev
am: 1e09e9826b

* commit '1e09e9826b24c6d877920b027954e0e861a336a0':
  Fix threading problems with drawables

Change-Id: I06a58a1a9454f9e9c384b9999ef6077cc45cf46f
2016-05-18 00:28:48 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Jorim Jaggi
ca0cf0f529 Fix threading problems with drawables
We can't use the same instance on both the main and the background
thread, as this will lead to problems.

Change-Id: Ieec525f028df2d0596667126d8f5004773461517
Fixes: 28745682
2016-05-17 23:05:38 +00:00
Joe Onorato
1cc1d13d6e Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
It's raising alarm bells but there isn't much we can do without a lot
of rewriting inside the ActivityManager.  The only consequence is stats
that are off by a little bit.

Bug: 28581070
Change-Id: If51568c3a708a907ceef6452e7d45599a57454f7
2016-05-17 15:31:38 -07:00
Michael Kwan
3ffbb6e7f9 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev am: 59bce44aaa
am: 4fab094b07

* commit '4fab094b0731686d84c09f42f9e2380ce0f85b1b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: I90e8e527d9628d17a8281ad5b2b79d9090841f3b
2016-05-17 18:20:23 +00:00
Michael Kwan
4fab094b07 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev
am: 59bce44aaa

* commit '59bce44aaaad61c5bd57ddcc1225e69ad5d0500b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: Ice8251602843a6a98552bcb85272d8cc9eefae2b
2016-05-17 18:14:47 +00:00
Michael Kwan
59bce44aaa Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 2016-05-17 18:03:38 +00:00
Sergio Giro
81b1b5463a Merge "ZygoteInit: remove extra copy of method" into nyc-mr1-dev-plus-aosp
am: 7bc107228c

* commit '7bc107228c0a41882f4202e568f48580d24bb7ba':
  ZygoteInit: remove extra copy of method

Change-Id: I93614394b6c5b97ba804bb7949f3c1b6a41ef510
2016-05-17 17:41:09 +00:00
Sergio Giro
d498859c4a ZygoteInit: remove extra copy of method
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

(cherry picked from commit 57b8a73d0e)

Change-Id: Idbb046ae47d608343ffb5cbf2df8e0c00920c909
2016-05-17 18:27:56 +01:00
Phil Weaver
1cc8e5f431 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 am: bc176c4fbf
am: c0a46cf445

* commit 'c0a46cf445b620156e27b4d24dbd9f8e90c2d8ee':
  Content description for FloatingToobar overflow.

Change-Id: I2b4a10f15b5956de083b92d3e892aa80fa782017
2016-05-17 17:25:38 +00:00
Phil Weaver
c0a46cf445 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7
am: bc176c4fbf

* commit 'bc176c4fbf3ab075343699f57c5fc2583549e865':
  Content description for FloatingToobar overflow.

Change-Id: Ic8ab8de6fcb433e26e811f87df3ab99e93dc054c
2016-05-17 17:22:01 +00:00
Phil Weaver
bc176c4fbf Merge "Content description for FloatingToobar overflow." into nyc-dev
am: 43141e33f7

* commit '43141e33f7e7da5b7514549cf23f5228915f11d8':
  Content description for FloatingToobar overflow.

Change-Id: I6118131870a8c3bfa51befa9973808fadfa9caf6
2016-05-17 17:16:46 +00:00
Phil Weaver
efae6e9ff1 Merge "Content description for FloatingToobar overflow." into nyc-dev
am: 43141e33f7

* commit '43141e33f7e7da5b7514549cf23f5228915f11d8':
  Content description for FloatingToobar overflow.

Change-Id: Id7656042c60e76a5afa593df1613e1a609366507
2016-05-17 17:15:25 +00:00
Phil Weaver
43141e33f7 Merge "Content description for FloatingToobar overflow." into nyc-dev 2016-05-17 17:08:29 +00:00
Sergio Giro
57b8a73d0e ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

Change-Id: I2d91ee38fe93f600bec89651416e84ab83ef9d4a
2016-05-17 17:55:27 +01:00
Sergio Giro
d91f7f4e71 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8 am: 9d95ab47ff
am: 093adbb330

* commit '093adbb3304098eb8d336ff2bebef335dc94bbb1':
  ZygoteInit: warm up JCA providers during preload

Change-Id: Ib039242b086ee995e9428db043cce47a13860cba
2016-05-17 16:12:43 +00:00
Sergio Giro
093adbb330 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8
am: 9d95ab47ff

* commit '9d95ab47ff318ebb30804dce0890b4de414d5844':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I0c987173ffc212581b21958091e288de531e3e97
2016-05-17 16:06:43 +00:00
Sergio Giro
9d95ab47ff Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41
am: ef42102cf8

* commit 'ef42102cf8d0dd238deb1871bef07f9646622a91':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I7c8ed5394af0c6e1fd25b289ca615125c4e3c38e
2016-05-17 16:01:45 +00:00
Sergio Giro
ef42102cf8 Merge "ZygoteInit: warm up JCA providers during preload"
am: aa733e0b41

* commit 'aa733e0b41e4e15908a4c89e935f824cc5908b4d':
  ZygoteInit: warm up JCA providers during preload

Change-Id: If96e2e482e3fc01c2d3be5eee6d405f9bb5a6571
2016-05-17 15:56:32 +00:00
Sergio Giro
b07595d194 ZygoteInit: warm up JCA providers during preload
This makes the time spent in the first call of an app to
SSLSocketFactory.getDefault() drop from ~240 ms to ~50 ms. In M
it was around ~6ms. This is due to the fact that, while instantiating
the default factory, all providers are initialized.

In order to obtain the timings above, I created an app calling
SSLSocketFactory.getDefault in onCreate and timed it
with System.currentTimeMillis() .

(cherry picked from commit 6cb7b1c476)

Bug: 28545496

Change-Id: Ic5aab3ece609d9fef06fee4ccb83d8371af075b2
2016-05-17 14:39:44 +01:00
Sergio Giro
ec045a8c12 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev am: 5a68af3840 am: d423407254
am: 975bca09fe

* commit '975bca09fe713e29bd650db47e3e2b083ee2b3ab':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I2e64cd4408c2d4afe885eb68502f09c96788579f
2016-05-17 11:21:09 +00:00
Sergio Giro
975bca09fe Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev am: 5a68af3840
am: d423407254

* commit 'd423407254bcdb33e6b19239096c1d5db7d6cdd5':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I2295ea88e46868ded46e276cffb57c341da88d69
2016-05-17 11:15:59 +00:00
Sergio Giro
d423407254 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev
am: 5a68af3840

* commit '5a68af384037f2980215dd45b91c5165c779d4e8':
  ZygoteInit: warm up JCA providers during preload

Change-Id: If7879885eaefbd8499769d688eefde28edd15c87
2016-05-17 11:11:11 +00:00
Sergio Giro
a9f804bf41 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev
am: 5a68af3840

* commit '5a68af384037f2980215dd45b91c5165c779d4e8':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I3cf53b5125331fc3c59183c09c79516a98a62347
2016-05-17 11:10:54 +00:00
Sergio Giro
5a68af3840 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev 2016-05-17 11:02:20 +00:00
Sergio Giro
6cb7b1c476 ZygoteInit: warm up JCA providers during preload
This makes the time spent in the first call of an app to
SSLSocketFactory.getDefault() drop from ~240 ms to ~50 ms. In M
it was around ~6ms. This is due to the fact that, while instantiating
the default factory, all providers are initialized.

In order to obtain the timings above, I created an app calling
SSLSocketFactory.getDefault in onCreate and timed it
with System.currentTimeMillis() .

Bug: 28545496

Change-Id: I650d4b0435e67e481a41e02b0b538ce5cc993fa3
2016-05-17 10:02:09 +00:00
Christopher Tate
4800712482 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: b7ae368079
am: c4999be6e3

* commit 'c4999be6e34297f595c87cbe4c274e2bc8c1665a':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I8827677fe788f055fcb8c677915219ab179fa4be
2016-05-17 01:14:33 +00:00
Chris Tate
c4999be6e3 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117
am: b7ae368079

* commit 'b7ae3680798aa5dce807015a763a0d017ce7e0c1':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: Idcc14b5f890497a6bf59755d91f66c27f5db3451
2016-05-17 01:09:35 +00:00
Christopher Tate
b7ae368079 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I5987e96ea1d2668037a7f924ad3ee6b5fa96bda8
2016-05-17 01:05:23 +00:00
Christopher Tate
d4056a279d Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I7c894dd6dc494dc5c02ba9e9676b53b0acc281d4
2016-05-17 01:03:59 +00:00
Chris Tate
11d9586117 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 2016-05-17 00:56:49 +00:00
Svetoslav Ganov
4647732c9b Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b am: 4f968024f4
am: c653375758

* commit 'c6533757587f28efdabc7d040750a9bed3062063':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Ic268c41a8867e26982d21a258d22a195e1c171c7
2016-05-16 23:04:36 +00:00
Svetoslav Ganov
c653375758 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b
am: 4f968024f4

* commit '4f968024f4822155e8428b9e5d8aea3114687412':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Ia7acd68dfd29d855e26f11a36e04dde153055d62
2016-05-16 22:55:57 +00:00
Svetoslav Ganov
4f968024f4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: I177256a7f65b3f5c98e5ddc5cf57a7cb47c965ab
2016-05-16 22:51:03 +00:00
Svetoslav Ganov
5f8c5ec9a4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Iebbe27690aeac898807c13ef05c730697dbb406a
2016-05-16 22:48:35 +00:00