Commit Graph

214768 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
cfae35a400 Merge "Fix misc-macro-parentheses warnings in DngCreator."
am: d439efc361

* commit 'd439efc361535701f6d2d0b82cfa22b9d4a5898b':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I5fd1127ff3efde3b44ac6d358d48665f89d54e01
2016-05-27 18:09:49 +00:00
Chih-hung Hsieh
d439efc361 Merge "Fix misc-macro-parentheses warnings in DngCreator." 2016-05-27 17:56:46 +00:00
Simon Dubray
f1187008c1 Merge "Chronometer: Update the value only if displayed on screen"
am: 34cd48bcd8

* commit '34cd48bcd8d284d864a0876db1373099c51b98e2':
  Chronometer: Update the value only if displayed on screen

Change-Id: I01a820daaa6308c1cc00cd19940db12ec827f424
2016-05-27 14:26:23 +00:00
Alan Viverette
34cd48bcd8 Merge "Chronometer: Update the value only if displayed on screen" 2016-05-27 14:18:20 +00:00
Miao Wang
349e2f1558 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
am: f1f13f98b5

* commit 'f1f13f98b58467b69c0ac9d4ba43d3f083525966':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: Ib2c03454a8fa19a279820a2809686646f54bdfc9
2016-05-25 22:43:13 +00:00
Miao Wang
e31342e692 Merge "Update documentation about copyTo and copyFrom."
am: 4cd38c30e6

* commit '4cd38c30e609c2ddb6ee3f8785750ff6a12c57d6':
  Update documentation about copyTo and copyFrom.

Change-Id: I9125dec95270b265fba34db5ed6e9df6deaed5c3
2016-05-25 22:43:07 +00:00
Miao Wang
f1f13f98b5 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." 2016-05-25 22:28:35 +00:00
Miao Wang
4cd38c30e6 Merge "Update documentation about copyTo and copyFrom." 2016-05-25 22:25:40 +00:00
Miao Wang
6aaede8cd7 [RenderScript] Fix ScriptIntrinsicBlur documentation.
Bug: 28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
(cherry picked from commit c242fa6b5d)
2016-05-25 14:44:10 -07:00
Miao Wang
1641dc9e68 Update documentation about copyTo and copyFrom.
Bug: 23159764
Bug: 26862970

  - Add detailed description of AutoPadding
  - Add comments to all the copy related APIs.
  - Fix typos in the comments.

Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9
(cherry picked from commit 3231e8e022)
2016-05-25 14:38:43 -07:00
Pavlin Radoslavov
3ef690cd7f Merge "Add missing "try ... finally" safeguards"
am: 47ae606d2c

* commit '47ae606d2c7b642e559527f1f6ff175ae9b29de1':
  Add missing "try ... finally" safeguards

Change-Id: I4d15b25f3e72d26c6a8efae21b8952ab72203a1d
2016-05-25 01:14:20 +00:00
Treehugger Robot
47ae606d2c Merge "Add missing "try ... finally" safeguards" 2016-05-25 01:07:47 +00:00
Pavlin Radoslavov
9a69daa706 Add missing "try ... finally" safeguards
Safeguards for code protected by ReentrantReadWriteLock.

Bug: 28734075
Bug: 28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
(cherry picked from commit e957a8a0b4)
2016-05-24 17:14:51 -07:00
Pavlin Radoslavov
e1a60983da Merge "Reduced the impact of "synchronized" statements"
am: 1c3b50a00e

* commit '1c3b50a00ea3ab23569a697ba1f1e756098a01a2':
  Reduced the impact of "synchronized" statements

Change-Id: I7ddeb85696efe31c52db3a97ec2a142cb03bee65
2016-05-24 23:25:03 +00:00
Treehugger Robot
1c3b50a00e Merge "Reduced the impact of "synchronized" statements" 2016-05-24 23:17:36 +00:00
Pavlin Radoslavov
2b016a1711 Reduced the impact of "synchronized" statements
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
 appropriate. The lock protects the access to and the setting of
 BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
 associated state.

Bug: 28734075
Bug: 28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
(cherry picked from commit eb50a39e98)
2016-05-24 21:17:42 +00:00
Chih-Hung Hsieh
ba11b8e441 Merge "Fix misc-macro-parentheses warnings in common_time."
am: c49d21f9c4

* commit 'c49d21f9c4ac128bf150ba7c78c0c416640b8f77':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: Id0a364de6bbd776dc01cc5298a4a38f62b491020
2016-05-24 19:50:27 +00:00
Treehugger Robot
c49d21f9c4 Merge "Fix misc-macro-parentheses warnings in common_time." 2016-05-24 19:39:17 +00:00
Chih-Hung Hsieh
ca3f49d594 Merge "Fix misc-macro-parentheses warnings in audio media jni."
am: 9ecb10d1b5

* commit '9ecb10d1b5a6cb0eb77beb432f2a4d657835414f':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: I201e57e87ae5eb52412f846e7652b695b1e15edb
2016-05-24 18:46:10 +00:00
Treehugger Robot
9ecb10d1b5 Merge "Fix misc-macro-parentheses warnings in audio media jni." 2016-05-24 18:33:48 +00:00
Vasco Brito
72813ddd5b Merge "Add free short codes for Direct Carrier Billing."
am: 8b5bbbbfa4

* commit '8b5bbbbfa4318401dd074440250850ec14c0264c':
  Add free short codes for Direct Carrier Billing.

Change-Id: I9ca55ccf48217f9aede7c8cc25c94070bc39e5df
2016-05-24 16:07:19 +00:00
Robert Greenwalt
8b5bbbbfa4 Merge "Add free short codes for Direct Carrier Billing." 2016-05-24 15:57:10 +00:00
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
Vasco Brito
39c5570a3f Add free short codes for Direct Carrier Billing.
All short codes are used by DCB on Google Play. Fixed default pattern for countries added recently.
Internal bug b/27911552.

Change-Id: I9b4a2bb30f2c6de058cc2adb75b67c4f69182198
Signed-off-by: Vasco Brito <vascob@google.com>
2016-05-20 11:08:55 +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
2bd7a3efc4 Fix misc-macro-parentheses warnings in common_time.
Bug: 28705665
Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5
2016-05-19 15:21:42 -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
Chih-Hung Hsieh
0ca16ef3b8 Fix misc-macro-parentheses warnings in audio media jni.
Bug: 28705665
Change-Id: Iff476943a0a2c2ae68778d1f4bca5d3e9e04bd26
2016-05-19 15:14:54 -07:00
Chih-Hung Hsieh
3c22e00fb9 Fix misc-macro-parentheses warnings in DngCreator.
Bug: 28705665
Change-Id: Ia9b513411456b34b3e508793166ddb17e34dec13
2016-05-19 15:10:07 -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