Commit Graph

214741 Commits

Author SHA1 Message Date
Sergio Giro
163f8a2e91 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
am: 393b67d65f

* commit '393b67d65fdbf4565cbec2f40fcabaaf87143dfd':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Idc8e1ca4ae2160285fe56995290c241c3a7288f2
2016-05-24 12:06:25 +00:00
Sergio Giro
393b67d65f Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" 2016-05-24 11:56:50 +00:00
Sergio Giro
80755a5a25 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() .

(cherry picked from commit 69de32071c)

Bug: 28545496
Change-Id: Ic4e11d058fb404eaa92db925a3e765fc3bef7ae2
2016-05-23 11:24:34 +01:00
Chih-Hung Hsieh
f55c9f7aa6 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."
am: 6f4b566169

* commit '6f4b5661696355d230c515a45aca2dddd8fe99b1':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I5333078964a57c20144acb6b538205bde2782c12
2016-05-19 23:29:32 +00:00
Chih-Hung Hsieh
d05b6478d5 Merge "Fix misc-macro-parentheses warnings in services jni."
am: fe91d2a83d

* commit 'fe91d2a83daee3604a49c1bae0744cdde6d14b46':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: I3ca66bf839e5a720e610657fc9afb6dbb8b853f8
2016-05-19 23:29:28 +00:00
Adam Lesinski
6f4b566169 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 2016-05-19 23:25:09 +00:00
Treehugger Robot
fe91d2a83d Merge "Fix misc-macro-parentheses warnings in services jni." 2016-05-19 23:24:03 +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
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
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
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
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
Andre Eisenbach
53ccfe848f Merge "Fix GATT autoConnect race condition" 2016-05-19 21:59:25 +00:00
Sungki Kim
636ab03dfe 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:23:44 +00:00
Alex Light
8f578530a9 Merge "Make fake libart for misbehaving apps be loaded."
am: 4bc3d32b15

* commit '4bc3d32b15cdcae7685722e7a20007c7aa9ae949':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Ia256fdb964f69c029c3b1e8e10ff396f79048cb4
2016-05-18 21:13:23 +00:00
Alex Light
4bc3d32b15 Merge "Make fake libart for misbehaving apps be loaded." 2016-05-18 21:05:42 +00:00
Alex Light
0a72ba7d3f Make fake libart for misbehaving apps be loaded.
Bug: 27775991
Change-Id: Ie4eba211e876ec0643ce6ecf6a110f3cb5e0f57e
(cherry picked from commit 20ed24fc0c)
2016-05-18 08:14:34 -07: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
9b1d64410d Merge "Add support for ICU data pinning in the Zygote" 2016-05-18 11:45:35 +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
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
aa733e0b41 Merge "ZygoteInit: warm up JCA providers during preload" 2016-05-17 15:50:50 +00:00
Shibin George
8434b4cf1b Merge "Synchronize access of mSubscriptions"
am: d065220a54

* commit 'd065220a547c985be3bd17bb8f2ff473427aa978':
  Synchronize access of mSubscriptions

Change-Id: I5b28986dd770abbeeb9aaff872577230c3b56abd
2016-05-17 14:14:59 +00:00
Treehugger Robot
d065220a54 Merge "Synchronize access of mSubscriptions" 2016-05-17 14:07:15 +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
Jakub Pawlowski
e82ac1b564 Merge "Fix GATT Characteristic write type serialization"
am: 233f48e3fa

* commit '233f48e3fa4321a9a2e2523a67a8e5120def5c33':
  Fix GATT Characteristic write type serialization

Change-Id: Ica00ad9ce313a27e82c5740061347f034c69db0e
2016-05-14 00:16:52 +00:00
Andre Eisenbach
233f48e3fa Merge "Fix GATT Characteristic write type serialization" 2016-05-14 00:11:42 +00:00
xu.peng
ff3a7571c7 Merge "Fix "TelephonyRegistry notifies wrong data status""
am: 3b2f202599

* commit '3b2f202599bca3da369667bf69ab39df9d8d894d':
  Fix "TelephonyRegistry notifies wrong data status"

Change-Id: I2d9ecd7132c8028c79b008b737b4b7d6d87211b3
2016-05-13 17:54:56 +00:00
Treehugger Robot
3b2f202599 Merge "Fix "TelephonyRegistry notifies wrong data status"" 2016-05-13 17:46:41 +00:00
Elliott Hughes
bc905021d0 Merge "Make android_net_NetUtils include what it actually uses."
am: e8f373e442

* commit 'e8f373e442a301691aa8f35f1dfb46e8149b450b':
  Make android_net_NetUtils include what it actually uses.

Change-Id: Iddc38891a66e6a868eef3af4ce025c7d7af1fb15
2016-05-13 15:13:01 +00:00
Elliott Hughes
e8f373e442 Merge "Make android_net_NetUtils include what it actually uses." 2016-05-13 15:04:18 +00:00
Shibin George
23d28cecf8 Synchronize access of mSubscriptions
Introduction of setConfigAsync to set Zen mode config
asynchronously leads to synchronization issues like
ArrayIndexOutOfBoundsException while accessing mSubscriptions.

Change-Id: I6f72d894605498e0a4b48eb58af19851be53b9dc
2016-05-13 17:36:15 +05:30
xu.peng
9071ced8b0 Fix "TelephonyRegistry notifies wrong data status"
TelephonyRegistry should notify data status by correct subId,
otherwise in some case, SIM1 data status will be overried
by SIM2 data status.
Such as screen on/off action.If in fact SIM1 is data connected
to download something, but SIM2 is not,then sreen off,
both SIM1 and SIM2 will be notified to update data status.
Then SIM1 data status will be overried by SIM2 to be "no data
connected", before SIM1 data downloading is finished,SIM1
will not be able to show "data conneced" status.

Change-Id: Ia7d0767b3b4520294ee0d024903f7522cb0a0110
2016-05-13 05:38:21 +00:00
Steve Pomeroy
b654fae4db Merge "Fix documentation bug in SQLiteDatabase"
am: 21d061ec2e

* commit '21d061ec2e1a097b8759c55e2368ffa6024b6f92':
  Fix documentation bug in SQLiteDatabase

Change-Id: I986c5024e1c4843ec891ffb76f467e42aacb89f6
2016-05-12 22:29:22 +00:00
Treehugger Robot
21d061ec2e Merge "Fix documentation bug in SQLiteDatabase" 2016-05-12 22:25:20 +00:00
Steve Pomeroy
78e5a04902 Merge "ContentValues: improve documentation"
am: b44d4207c1

* commit 'b44d4207c1dc2131e022ddcad74be6d121a51b5e':
  ContentValues: improve documentation

Change-Id: I6c50514fa7b3531da96364d5624e3b093b984007
2016-05-12 22:24:41 +00:00
Treehugger Robot
b44d4207c1 Merge "ContentValues: improve documentation" 2016-05-12 22:17:32 +00:00
Steve Pomeroy
1276b5f29e ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2016-05-12 21:18:15 +00:00
Steve Pomeroy
8fc3144fa5 Fix documentation bug in SQLiteDatabase
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.

Close: https://code.google.com/p/android/issues/detail?id=13045

Change-Id: Ife919c4dcf7bf703b692d338d1fb5844a532dd39
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2016-05-12 21:16:55 +00:00
Chad Brubaker
1e66b26c41 Merge "Support TrustedCertificateStore.findAllIssuers"
am: d58e7b2d15

* commit 'd58e7b2d15f4ca60d96bd0fa5e294c40eea76c14':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: If29fab8118a025b5339b0076eaba43d99bbca04a
2016-05-12 19:26:47 +00:00
Chad Brubaker
d58e7b2d15 Merge "Support TrustedCertificateStore.findAllIssuers" 2016-05-12 19:18:47 +00:00
Chad Brubaker
d4b6c696e1 Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit aa6c3c3e25)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
2016-05-12 11:15:47 -07:00
Elliott Hughes
7691b78fbb Make android_net_NetUtils include what it actually uses.
Bug: http://b/28519060
Change-Id: I49dcd358d3fc8e0ba5c5e0b50a0f5dcc63281d22
2016-05-11 15:18:13 -07:00
Miao Wang
b02f7b0a0e Merge "[RenderScript] Interrupt mMessageThread when tearing down context."
am: 9f2a1979a7

* commit '9f2a1979a750788f572709fe13c66a917ba8fdf8':
  [RenderScript] Interrupt mMessageThread when tearing down context.

Change-Id: Ie2b99b85e22b3e871111e33785565f8159939112
2016-05-11 19:23:54 +00:00
Miao Wang
9f2a1979a7 Merge "[RenderScript] Interrupt mMessageThread when tearing down context." 2016-05-11 19:13:00 +00:00
Joachim Sauer
9df8eeb567 Merge "Fix AbstractStringBuilder gaining extra APIs."
am: b64859d899

* commit 'b64859d89999c1e87ae3980192a4987ba4baa002':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: I392e2dde81254d38abd48e2027d94ec960560ed5
2016-05-11 13:51:06 +00:00
Joachim Sauer
b64859d899 Merge "Fix AbstractStringBuilder gaining extra APIs." 2016-05-11 13:47:09 +00:00
Joachim Sauer
a305ee1027 Fix AbstractStringBuilder gaining extra APIs.
AbstractStringBuilder showed up in the API as gaining methods originally
belonging to StringBuffer/StringBuilder (mostly append(*) and
insert(*)).

Ideally it should not be in the API at all, but it's traditionally been
there and we'll keep it for now.

@hide the affected methods and move the "implements Appendable"
definition to StringBuffer/StringBuilder (as methods implementing an
interface can't be @hidden).

(cherry picked from commit 91f4aec3cc)

Bug: 27582395
Change-Id: I0b85c2c84f3e52ffe7864728d083f9c6ea7304ef
2016-05-11 14:19:44 +01:00
Jakub Pawlowski
2168fc29a2 Fix GATT Characteristic write type serialization
Default writeType for GATT characteristic was not being
serialized into Parcel. This cause errors when trying to
write into Characteristic.

Bug: 27910548
Change-Id: Ib2f88cf991123eaea244f16fa36deb0d773c5a33
2016-05-11 06:53:10 +00:00