OSDN Git Service
Vasco Brito [Wed, 1 Jun 2016 18:51:28 +0000 (18:51 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
am:
56bd06fc3e
* commit '
56bd06fc3e29290ba90b792a7f7353864cbf772a':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: I0450be79c583cd2fc27156460b32b23830fc3c68
Robert Greenwalt [Wed, 1 Jun 2016 18:15:15 +0000 (18:15 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Vasco Brito [Wed, 1 Jun 2016 09:50:57 +0000 (10:50 +0100)]
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
This reverts commit
9a769a482861496686a4138a0a9b612a08fce8f8, reversing
changes made to
6fb921a61b0ca6bac8002e0fdbeb521453dce408.
Vasco Brito [Tue, 31 May 2016 18:10:42 +0000 (18:10 +0000)]
Merge "Add 900 for Russia - Short code used by Sberbank."
am:
9a769a4828
* commit '
9a769a482861496686a4138a0a9b612a08fce8f8':
Add 900 for Russia - Short code used by Sberbank.
Change-Id: I0eac4eb99a84a489c1907a3d1fd4dd944527404e
Treehugger Robot [Tue, 31 May 2016 18:06:29 +0000 (18:06 +0000)]
Merge "Add 900 for Russia - Short code used by Sberbank."
Vasco Brito [Tue, 24 May 2016 18:23:20 +0000 (19:23 +0100)]
Add 900 for Russia - Short code used by Sberbank.
Sberbank SMS banking solution uses 900 short code.
They have requested this shortcode to be listed has premium to reduce banking fraud.
bug:
28423611
Change-Id: I82dfe012a1e55b2d025c24e50149fa01551a92ed
Signed-off-by: Vasco Brito <vascob@google.com>
Greg Hackmann [Sat, 28 May 2016 16:34:39 +0000 (16:34 +0000)]
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""
am:
6fb921a61b
* commit '
6fb921a61b0ca6bac8002e0fdbeb521453dce408':
Revert "AlarmManagerService: remove legacy /dev/alarm support"
Change-Id: I7cfaa210c181c9f3754727797609d3ed4ce3244e
Treehugger Robot [Sat, 28 May 2016 16:19:03 +0000 (16:19 +0000)]
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""
Greg Hackmann [Sat, 28 May 2016 13:07:22 +0000 (13:07 +0000)]
Revert "AlarmManagerService: remove legacy /dev/alarm support"
This reverts commit
f68cdb9cb4841765d9d55d4a95259e9c3bb3ecc1.
Change-Id: I13e954656771f32c6156b4c4adb52922bcd0717a
Greg Hackmann [Fri, 27 May 2016 21:18:22 +0000 (21:18 +0000)]
Merge "AlarmManagerService: remove legacy /dev/alarm support"
am:
1f336bb051
* commit '
1f336bb051e4d11ff3f8cdc2aa9486116c3f2b34':
AlarmManagerService: remove legacy /dev/alarm support
Change-Id: Iaf69b28333c62572327d8a4362e714a7a5e44de2
Treehugger Robot [Fri, 27 May 2016 21:12:15 +0000 (21:12 +0000)]
Merge "AlarmManagerService: remove legacy /dev/alarm support"
Greg Hackmann [Mon, 25 Apr 2016 20:30:34 +0000 (13:30 -0700)]
AlarmManagerService: remove legacy /dev/alarm support
We've removed the Android alarm driver from our supported kernels. It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.
Bug:
28357356
Change-Id: I225d76c3f4e695a831d4419e050e8e178e1224b5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Chih-Hung Hsieh [Fri, 27 May 2016 18:09:49 +0000 (18:09 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator."
am:
d439efc361
* commit '
d439efc361535701f6d2d0b82cfa22b9d4a5898b':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: I5fd1127ff3efde3b44ac6d358d48665f89d54e01
Chih-hung Hsieh [Fri, 27 May 2016 17:56:46 +0000 (17:56 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator."
Simon Dubray [Fri, 27 May 2016 14:26:23 +0000 (14:26 +0000)]
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
Alan Viverette [Fri, 27 May 2016 14:18:20 +0000 (14:18 +0000)]
Merge "Chronometer: Update the value only if displayed on screen"
Miao Wang [Wed, 25 May 2016 22:43:13 +0000 (22:43 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
am:
f1f13f98b5
* commit '
f1f13f98b58467b69c0ac9d4ba43d3f083525966':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: Ib2c03454a8fa19a279820a2809686646f54bdfc9
Miao Wang [Wed, 25 May 2016 22:43:07 +0000 (22:43 +0000)]
Merge "Update documentation about copyTo and copyFrom."
am:
4cd38c30e6
* commit '
4cd38c30e609c2ddb6ee3f8785750ff6a12c57d6':
Update documentation about copyTo and copyFrom.
Change-Id: I9125dec95270b265fba34db5ed6e9df6deaed5c3
Miao Wang [Wed, 25 May 2016 22:28:34 +0000 (22:28 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
Miao Wang [Wed, 25 May 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Update documentation about copyTo and copyFrom."
Miao Wang [Wed, 13 Apr 2016 23:43:10 +0000 (16:43 -0700)]
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Bug:
28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
(cherry picked from commit
c242fa6b5d7b8624b5ce710c1e2740c5bb9679dd)
Miao Wang [Fri, 1 Apr 2016 22:10:47 +0000 (15:10 -0700)]
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
3231e8e0220614f7b1628493da5f276f19faab7c)
Pavlin Radoslavov [Wed, 25 May 2016 01:14:20 +0000 (01:14 +0000)]
Merge "Add missing "try ... finally" safeguards"
am:
47ae606d2c
* commit '
47ae606d2c7b642e559527f1f6ff175ae9b29de1':
Add missing "try ... finally" safeguards
Change-Id: I4d15b25f3e72d26c6a8efae21b8952ab72203a1d
Treehugger Robot [Wed, 25 May 2016 01:07:47 +0000 (01:07 +0000)]
Merge "Add missing "try ... finally" safeguards"
Pavlin Radoslavov [Tue, 24 May 2016 22:28:41 +0000 (15:28 -0700)]
Add missing "try ... finally" safeguards
Safeguards for code protected by ReentrantReadWriteLock.
Bug:
28734075
Bug:
28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
(cherry picked from commit
e957a8a0b4100d001f79c866e7904d2426ac8da0)
Pavlin Radoslavov [Tue, 24 May 2016 23:25:03 +0000 (23:25 +0000)]
Merge "Reduced the impact of "synchronized" statements"
am:
1c3b50a00e
* commit '
1c3b50a00ea3ab23569a697ba1f1e756098a01a2':
Reduced the impact of "synchronized" statements
Change-Id: I7ddeb85696efe31c52db3a97ec2a142cb03bee65
Treehugger Robot [Tue, 24 May 2016 23:17:36 +0000 (23:17 +0000)]
Merge "Reduced the impact of "synchronized" statements"
Pavlin Radoslavov [Mon, 23 May 2016 05:16:41 +0000 (22:16 -0700)]
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
eb50a39e98acb78d16465041bb5c172aa1637e97)
Chih-Hung Hsieh [Tue, 24 May 2016 19:50:27 +0000 (19:50 +0000)]
Merge "Fix misc-macro-parentheses warnings in common_time."
am:
c49d21f9c4
* commit '
c49d21f9c4ac128bf150ba7c78c0c416640b8f77':
Fix misc-macro-parentheses warnings in common_time.
Change-Id: Id0a364de6bbd776dc01cc5298a4a38f62b491020
Treehugger Robot [Tue, 24 May 2016 19:39:17 +0000 (19:39 +0000)]
Merge "Fix misc-macro-parentheses warnings in common_time."
Chih-Hung Hsieh [Tue, 24 May 2016 18:46:10 +0000 (18:46 +0000)]
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
Treehugger Robot [Tue, 24 May 2016 18:33:48 +0000 (18:33 +0000)]
Merge "Fix misc-macro-parentheses warnings in audio media jni."
Vasco Brito [Tue, 24 May 2016 16:07:19 +0000 (16:07 +0000)]
Merge "Add free short codes for Direct Carrier Billing."
am:
8b5bbbbfa4
* commit '
8b5bbbbfa4318401dd074440250850ec14c0264c':
Add free short codes for Direct Carrier Billing.
Change-Id: I9ca55ccf48217f9aede7c8cc25c94070bc39e5df
Robert Greenwalt [Tue, 24 May 2016 15:57:09 +0000 (15:57 +0000)]
Merge "Add free short codes for Direct Carrier Billing."
Sergio Giro [Tue, 24 May 2016 12:06:25 +0000 (12:06 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
am:
393b67d65f
* commit '
393b67d65fdbf4565cbec2f40fcabaaf87143dfd':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Idc8e1ca4ae2160285fe56995290c241c3a7288f2
Sergio Giro [Tue, 24 May 2016 11:56:50 +0000 (11:56 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
Sergio Giro [Tue, 17 May 2016 15:52:33 +0000 (16:52 +0100)]
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
69de32071c8ca7fa2277e4340a320b7df6fe963d)
Bug:
28545496
Change-Id: Ic4e11d058fb404eaa92db925a3e765fc3bef7ae2
Vasco Brito [Thu, 19 May 2016 16:30:43 +0000 (17:30 +0100)]
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>
Chih-Hung Hsieh [Thu, 19 May 2016 23:29:32 +0000 (23:29 +0000)]
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
Chih-Hung Hsieh [Thu, 19 May 2016 23:29:28 +0000 (23:29 +0000)]
Merge "Fix misc-macro-parentheses warnings in services jni."
am:
fe91d2a83d
* commit '
fe91d2a83daee3604a49c1bae0744cdde6d14b46':
Fix misc-macro-parentheses warnings in services jni.
Change-Id: I3ca66bf839e5a720e610657fc9afb6dbb8b853f8
Adam Lesinski [Thu, 19 May 2016 23:25:09 +0000 (23:25 +0000)]
Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."
Treehugger Robot [Thu, 19 May 2016 23:24:03 +0000 (23:24 +0000)]
Merge "Fix misc-macro-parentheses warnings in services jni."
Chih-Hung Hsieh [Thu, 19 May 2016 23:07:09 +0000 (23:07 +0000)]
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
Treehugger Robot [Thu, 19 May 2016 23:02:55 +0000 (23:02 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni."
Chih-Hung Hsieh [Thu, 19 May 2016 22:29:38 +0000 (15:29 -0700)]
Fix misc-macro-parentheses warnings in services jni.
Bug:
28705665
Change-Id: Iaf965875b667e45e1557e447de7988f729adfd52
Chih-Hung Hsieh [Thu, 19 May 2016 22:25:50 +0000 (15:25 -0700)]
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Bug:
28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
Chih-Hung Hsieh [Thu, 19 May 2016 22:21:42 +0000 (15:21 -0700)]
Fix misc-macro-parentheses warnings in common_time.
Bug:
28705665
Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5
Chih-Hung Hsieh [Thu, 19 May 2016 22:19:22 +0000 (15:19 -0700)]
Fix misc-macro-parentheses warnings in aapt and androidfw.
Bug:
28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
Chih-Hung Hsieh [Thu, 19 May 2016 22:14:54 +0000 (15:14 -0700)]
Fix misc-macro-parentheses warnings in audio media jni.
Bug:
28705665
Change-Id: Iff476943a0a2c2ae68778d1f4bca5d3e9e04bd26
Chih-Hung Hsieh [Thu, 19 May 2016 22:10:07 +0000 (15:10 -0700)]
Fix misc-macro-parentheses warnings in DngCreator.
Bug:
28705665
Change-Id: Ia9b513411456b34b3e508793166ddb17e34dec13
Sungki Kim [Thu, 19 May 2016 22:05:49 +0000 (22:05 +0000)]
Merge "Fix GATT autoConnect race condition"
am:
53ccfe848f
* commit '
53ccfe848f1b97cca12c7e5b496032e97594a8e2':
Fix GATT autoConnect race condition
Change-Id: Ia761a72b003751146b83314facfdaf936b1f9e9b
Andre Eisenbach [Thu, 19 May 2016 21:59:25 +0000 (21:59 +0000)]
Merge "Fix GATT autoConnect race condition"
Sungki Kim [Thu, 19 May 2016 17:18:07 +0000 (10:18 -0700)]
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
Alex Light [Wed, 18 May 2016 21:13:23 +0000 (21:13 +0000)]
Merge "Make fake libart for misbehaving apps be loaded."
am:
4bc3d32b15
* commit '
4bc3d32b15cdcae7685722e7a20007c7aa9ae949':
Make fake libart for misbehaving apps be loaded.
Change-Id: Ia256fdb964f69c029c3b1e8e10ff396f79048cb4
Alex Light [Wed, 18 May 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Make fake libart for misbehaving apps be loaded."
Alex Light [Wed, 20 Apr 2016 21:07:43 +0000 (14:07 -0700)]
Make fake libart for misbehaving apps be loaded.
Bug:
27775991
Change-Id: Ie4eba211e876ec0643ce6ecf6a110f3cb5e0f57e
(cherry picked from commit
20ed24fc0cbbada36e84dc1f1e86946db6e6c5a4)
Neil Fuller [Wed, 18 May 2016 11:51:05 +0000 (11:51 +0000)]
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
Neil Fuller [Wed, 18 May 2016 11:45:35 +0000 (11:45 +0000)]
Merge "Add support for ICU data pinning in the Zygote"
Neil Fuller [Mon, 9 May 2016 15:55:36 +0000 (16:55 +0100)]
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
Sergio Giro [Tue, 17 May 2016 15:56:32 +0000 (15:56 +0000)]
Merge "ZygoteInit: warm up JCA providers during preload"
am:
aa733e0b41
* commit '
aa733e0b41e4e15908a4c89e935f824cc5908b4d':
ZygoteInit: warm up JCA providers during preload
Change-Id: If96e2e482e3fc01c2d3be5eee6d405f9bb5a6571
Sergio Giro [Tue, 17 May 2016 15:50:50 +0000 (15:50 +0000)]
Merge "ZygoteInit: warm up JCA providers during preload"
Shibin George [Tue, 17 May 2016 14:14:59 +0000 (14:14 +0000)]
Merge "Synchronize access of mSubscriptions"
am:
d065220a54
* commit '
d065220a547c985be3bd17bb8f2ff473427aa978':
Synchronize access of mSubscriptions
Change-Id: I5b28986dd770abbeeb9aaff872577230c3b56abd
Treehugger Robot [Tue, 17 May 2016 14:07:14 +0000 (14:07 +0000)]
Merge "Synchronize access of mSubscriptions"
Sergio Giro [Fri, 13 May 2016 15:34:46 +0000 (16:34 +0100)]
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
6cb7b1c4765e9bc5175056826523dbd88426e9aa)
Bug:
28545496
Change-Id: Ic5aab3ece609d9fef06fee4ccb83d8371af075b2
Jakub Pawlowski [Sat, 14 May 2016 00:16:52 +0000 (00:16 +0000)]
Merge "Fix GATT Characteristic write type serialization"
am:
233f48e3fa
* commit '
233f48e3fa4321a9a2e2523a67a8e5120def5c33':
Fix GATT Characteristic write type serialization
Change-Id: Ica00ad9ce313a27e82c5740061347f034c69db0e
Andre Eisenbach [Sat, 14 May 2016 00:11:42 +0000 (00:11 +0000)]
Merge "Fix GATT Characteristic write type serialization"
xu.peng [Fri, 13 May 2016 17:54:56 +0000 (17:54 +0000)]
Merge "Fix "TelephonyRegistry notifies wrong data status""
am:
3b2f202599
* commit '
3b2f202599bca3da369667bf69ab39df9d8d894d':
Fix "TelephonyRegistry notifies wrong data status"
Change-Id: I2d9ecd7132c8028c79b008b737b4b7d6d87211b3
Treehugger Robot [Fri, 13 May 2016 17:46:41 +0000 (17:46 +0000)]
Merge "Fix "TelephonyRegistry notifies wrong data status""
Elliott Hughes [Fri, 13 May 2016 15:13:01 +0000 (15:13 +0000)]
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
Elliott Hughes [Fri, 13 May 2016 15:04:18 +0000 (15:04 +0000)]
Merge "Make android_net_NetUtils include what it actually uses."
Shibin George [Sat, 7 May 2016 10:46:50 +0000 (16:16 +0530)]
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
xu.peng [Tue, 22 Mar 2016 10:21:28 +0000 (18:21 +0800)]
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
Steve Pomeroy [Thu, 12 May 2016 22:29:22 +0000 (22:29 +0000)]
Merge "Fix documentation bug in SQLiteDatabase"
am:
21d061ec2e
* commit '
21d061ec2e1a097b8759c55e2368ffa6024b6f92':
Fix documentation bug in SQLiteDatabase
Change-Id: I986c5024e1c4843ec891ffb76f467e42aacb89f6
Treehugger Robot [Thu, 12 May 2016 22:25:20 +0000 (22:25 +0000)]
Merge "Fix documentation bug in SQLiteDatabase"
Steve Pomeroy [Thu, 12 May 2016 22:24:41 +0000 (22:24 +0000)]
Merge "ContentValues: improve documentation"
am:
b44d4207c1
* commit '
b44d4207c1dc2131e022ddcad74be6d121a51b5e':
ContentValues: improve documentation
Change-Id: I6c50514fa7b3531da96364d5624e3b093b984007
Treehugger Robot [Thu, 12 May 2016 22:17:32 +0000 (22:17 +0000)]
Merge "ContentValues: improve documentation"
Steve Pomeroy [Tue, 9 Oct 2012 19:37:34 +0000 (15:37 -0400)]
ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.
Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
Steve Pomeroy [Thu, 14 Mar 2013 04:42:10 +0000 (00:42 -0400)]
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>
Chad Brubaker [Thu, 12 May 2016 19:26:47 +0000 (19:26 +0000)]
Merge "Support TrustedCertificateStore.findAllIssuers"
am:
d58e7b2d15
* commit '
d58e7b2d15f4ca60d96bd0fa5e294c40eea76c14':
Support TrustedCertificateStore.findAllIssuers
Change-Id: If29fab8118a025b5339b0076eaba43d99bbca04a
Chad Brubaker [Thu, 12 May 2016 19:18:47 +0000 (19:18 +0000)]
Merge "Support TrustedCertificateStore.findAllIssuers"
Chad Brubaker [Fri, 18 Dec 2015 21:43:28 +0000 (13:43 -0800)]
Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit
aa6c3c3e252252b80c3900bd4c1ff27d37265c6d)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
Elliott Hughes [Wed, 11 May 2016 22:18:13 +0000 (15:18 -0700)]
Make android_net_NetUtils include what it actually uses.
Bug: http://b/
28519060
Change-Id: I49dcd358d3fc8e0ba5c5e0b50a0f5dcc63281d22
Miao Wang [Wed, 11 May 2016 19:23:54 +0000 (19:23 +0000)]
Merge "[RenderScript] Interrupt mMessageThread when tearing down context."
am:
9f2a1979a7
* commit '
9f2a1979a750788f572709fe13c66a917ba8fdf8':
[RenderScript] Interrupt mMessageThread when tearing down context.
Change-Id: Ie2b99b85e22b3e871111e33785565f8159939112
Miao Wang [Wed, 11 May 2016 19:13:00 +0000 (19:13 +0000)]
Merge "[RenderScript] Interrupt mMessageThread when tearing down context."
Joachim Sauer [Wed, 11 May 2016 13:51:06 +0000 (13:51 +0000)]
Merge "Fix AbstractStringBuilder gaining extra APIs."
am:
b64859d899
* commit '
b64859d89999c1e87ae3980192a4987ba4baa002':
Fix AbstractStringBuilder gaining extra APIs.
Change-Id: I392e2dde81254d38abd48e2027d94ec960560ed5
Joachim Sauer [Wed, 11 May 2016 13:47:08 +0000 (13:47 +0000)]
Merge "Fix AbstractStringBuilder gaining extra APIs."
Joachim Sauer [Tue, 10 May 2016 14:09:08 +0000 (15:09 +0100)]
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
91f4aec3ccb4b2a2b66fbde095baa584b0862c11)
Bug:
27582395
Change-Id: I0b85c2c84f3e52ffe7864728d083f9c6ea7304ef
Jakub Pawlowski [Fri, 1 Apr 2016 14:17:15 +0000 (07:17 -0700)]
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
Miao Wang [Tue, 10 May 2016 23:44:11 +0000 (16:44 -0700)]
[RenderScript] Interrupt mMessageThread when tearing down context.
- Interrupt mMessageThread, so it gets to see immediately
that mRun is false and exit rightaway.
Change-Id: Ic586ef225a5c6f3a77f89de00b7fb3f3547c9838
Hans Boehm [Tue, 10 May 2016 23:45:34 +0000 (23:45 +0000)]
Merge "Clear more native pointers in finalizers"
am:
a5ca0ca886
* commit '
a5ca0ca8860ac99eaa2ad7c959fd4e04d331153e':
Clear more native pointers in finalizers
Change-Id: I5577b85c83da164c0cb4add151bab18cf1555c9a
Hans Boehm [Tue, 10 May 2016 23:41:30 +0000 (23:41 +0000)]
Merge "Clear more native pointers in finalizers"
Hans Boehm [Tue, 10 May 2016 20:01:22 +0000 (13:01 -0700)]
Clear more native pointers in finalizers
This hopefully handles the remaining finalizers in frameworks/base
that didn't guard against calls from other finalizers after being
finalized.
The goal here is to reduce the possible corruption causes we have
to think about by a few.
If any of theses are either very frequently used, or use large
Java (as opposed to native) objects, we should probably convert them
to NativeAllocationRegistry instead. But that's more work.
Bug:
18178237
Change-Id: I79bc0e8fa20af8f340418a6226022e0294d77f02
Yi Kong [Mon, 9 May 2016 16:51:55 +0000 (16:51 +0000)]
Yi Kong [Mon, 9 May 2016 16:40:38 +0000 (16:40 +0000)]
Yi Kong [Thu, 5 May 2016 10:32:54 +0000 (11:32 +0100)]
Track libcore change
e2f147b9b14c7645f29e92758f811a18258feef4
Bug:
28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
Calin Juravle [Mon, 9 May 2016 15:53:14 +0000 (15:53 +0000)]
Merge "Read -Xjittransitionweight from system properties."
am:
53ce983c22
* commit '
53ce983c2298a7aa64a7f05d530fe78c8c288fd1':
Read -Xjittransitionweight from system properties.
Change-Id: I49fdb598852d28fc2c82bb0c123110c5333d6eb4
Calin Juravle [Mon, 9 May 2016 15:43:41 +0000 (15:43 +0000)]
Merge "Read -Xjittransitionweight from system properties."
Pavlin Radoslavov [Fri, 6 May 2016 23:28:58 +0000 (23:28 +0000)]
Merge "Fix divergent equals and hashCode behavior"
am:
e8579b12a3
* commit '
e8579b12a3c5be5fef25fc5a1c8c2c9d43e49347':
Fix divergent equals and hashCode behavior
Change-Id: I201238b2cb033e2b5f219896667c9438b5b7de05
Ajay Panicker [Fri, 6 May 2016 23:28:56 +0000 (23:28 +0000)]
Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected"
am:
04a7cfcf73
* commit '
04a7cfcf7378e91060a403e4d99590396aff16a6':
List the CONNECTION_STATE_CHANGED broadcast for MAP as protected
Change-Id: Ie361000c23cf9798b710106022f133551066b2dc
Ajay Panicker [Fri, 6 May 2016 23:28:54 +0000 (23:28 +0000)]
Merge "Protect TRANSFER_COMPLETE broadcast"
am:
1be1934e81
* commit '
1be1934e813289d1ce1c238b09161c1e223b7350':
Protect TRANSFER_COMPLETE broadcast
Change-Id: Ibe4fa7e639fd7bf13275417159c5c6a14d1e369d