92966 Commits

Author SHA1 Message Date
Brian Carlstrom
537fb0afe2 Merge "Use most specific attributes for distinguished name display" 2013-01-04 15:40:35 -08:00
Brian Carlstrom
91154ce658 Use most specific attributes for distinguished name display
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
2013-01-04 15:27:24 -08:00
Elliott Hughes
d13b23a436 Merge "Revert "fix potential memory leak"" 2013-01-03 17:40:55 -08:00
Elliott Hughes
957efcdc73 Revert "fix potential memory leak"
This reverts commit bc268b9014f211910e412a7fda96b6394ff2badc

Change-Id: I07f49bd0cfecc43bc761d2b0635c9915a8e30272
2013-01-03 17:38:57 -08:00
Elliott Hughes
9aac0c1b35 Merge "fix potential memory leak" 2013-01-03 17:35:57 -08:00
Sungmin Choi
bc268b9014 fix potential memory leak
use delete before return

Change-Id: I5449ad90bb6910f057bd825b722c9803a7343c34
2013-01-04 09:56:18 +09:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Wink Saville
881d5387a3 Merge "frameworks/base: Support for LTE network modes" 2013-01-03 14:49:05 -08:00
Victoria Lease
73e243c4d2 Merge "Fix logging typos in GpsLocationProvider" 2013-01-02 14:15:51 -08:00
Uma Maheswari Ramalingam
ec7f4a6953 frameworks/base: Support for LTE network modes
Change-Id: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
2013-01-02 14:05:58 -08:00
Amith Yamasani
554ed0f034 Merge "Fixed typo in Recreating an Activity documentation" 2013-01-02 09:00:28 -08:00
Elliott Hughes
5cb0f21846 Merge "StringBlock_nativeCreate: Possible Leak" 2012-12-21 17:17:42 -08:00
Gulshan Singh
870d2a2988 Fixed typo in Recreating an Activity documentation
The word although was spelled as althought. This is now fixed.
Signed-off-by: Gulshan Singh <gsingh2011@gmail.com>

Change-Id: Ia28a081bf9d8ab8be831c685cbfa4ddad3618a87
2012-12-21 17:13:43 -05:00
James Dong
5d5526aa86 Merge "Handle errors from AudioEffect::queryNumberEffects" 2012-12-21 14:05:09 -08:00
James Dong
c8db3b8ae3 Merge "Set "isdrm" info in Mediastore" 2012-12-21 13:34:42 -08:00
Magnus Eriksson
160c1ca117 Fix logging typos in GpsLocationProvider
Change-Id: Ibf12947f3758defee990fbf685323334b8d1eeda
Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
2012-12-21 21:07:28 +01:00
Irfan Sheriff
88fe4ebc0b Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
You Kim
218a313bb0 StringBlock_nativeCreate: Possible Leak
osb can be leaked when osb->getError() != NO_ERROR

Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
2012-12-21 06:19:38 +09:00
Victoria Lease
fc56015bd3 Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 2012-12-20 12:09:48 -08:00
Andrew Hsieh
62ec958865 Merge "Fix typo" 2012-12-19 16:10:12 -08:00
Glenn Kasten
ba97ad2a67 Merge "Leak in ToneGenerator_native_setup" 2012-12-19 08:47:20 -08:00
Andrew Hsieh
0482291f45 Fix typo
Change-Id: I58f863c4eb1eb4196d001c280027ab59bee51ce4
2012-12-19 11:21:38 +08:00
Elliott Hughes
171a990699 Merge "Update the JNI spec link, and remove a dead link." 2012-12-18 18:06:07 -08:00
Elliott Hughes
965da34de9 Update the JNI spec link, and remove a dead link.
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623
Change-Id: I521b640fdef17c98582171d97214486d16e774e4
2012-12-18 17:24:36 -08:00
Robert Greenwalt
9b64c4906b Merge "Return error upon attempt to use non-existent APN" 2012-12-18 11:02:52 -08:00
Mikael Hedegren
342a7cb69f Return error upon attempt to use non-existent APN
startUsingNetworkFeature will ignore errors from
reconnect - causing ConnectivityService to send
faulty information back to requester.

Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
2012-12-18 15:32:48 +01:00
Adam Powell
7979b58a7a Merge "Memory leak due to bad destroy sequence" 2012-12-17 14:39:56 -08:00
Christopher Tate
4b0ed0178d Merge "BackupHelpers: Fix Typo" 2012-12-17 10:39:41 -08:00
Craig Mautner
367921dd87 Merge "Toast: fix force close if called from system service" 2012-12-17 09:05:07 -08:00
Pawit Pornkitprasan
35e4a7029e Toast: fix force close if called from system service
If a toast is created from a system service, an application context
will not be available, use the service context instead.

Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075

Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
2012-12-17 18:04:17 +07:00
You Kim
8b2e2c8abc BackupHelpers: Fix Typo
delete --> free

Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
2012-12-17 03:36:10 +09:00
Elliott Hughes
c749261fea Merge "Fix DateUtils.formatElapsedTime." 2012-12-14 17:39:19 -08:00
zobject
686a805ef9 Fix NullpointException problem in onMenuItemSelected
If both title and condensed title is null,
item.getTitleCondensed() could be return null value
in onMenuItemSelected. therefore need to check
whether retun value is null or not.

Change-Id: Ib08f52b949a794aa7bd6cc25414041e820f62969
2012-12-15 08:23:26 +09:00
Elliott Hughes
2eda18485c Fix DateUtils.formatElapsedTime.
More reuse of StringBuilders, less broken home-grown formatting code.

Long-term, we should hand this over to icu4c, but they're not ready yet.

Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug: 7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
2012-12-14 14:29:47 -08:00
Marco Nelissen
01f42639f2 Merge "fix typo in docs" 2012-12-14 09:35:26 -08:00
Elliott Hughes
2eca1b53ae Merge "Add return after NULL check in JetPlayer" 2012-12-14 09:19:45 -08:00
Amith Yamasani
ffdc7aed5e Merge "avoid crashing system serer process" 2012-12-14 09:04:30 -08:00
Jean-Christophe PINCE
6169bcf50d Memory leak due to bad destroy sequence
During the destroy sequence, it happens that the mWebViewClassic was
set to null in the transferMessages function and consequently, the
call to WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic) is
not really removing the view from the watchdog's list; creating a
memory leak.

Change-Id: I2bae7c8d7c473e2af25e62a485699f88269d6658
Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 57869
2012-12-14 09:35:44 +08:00
Jeff Sharkey
bf8de6a349 Merge "Remove unnecessary locking for screen broadcasts." 2012-12-12 10:41:20 -08:00
Adam Powell
e7ec492f13 Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 2012-12-11 18:00:49 -08:00
Adam Powell
d22843a8a8 Merge "Fix regression in ListView click handling" 2012-12-11 17:57:58 -08:00
Robert Greenwalt
79e0e3fd69 Merge "return value of String.replace() is ignored." 2012-12-11 16:34:35 -08:00
Adam Powell
847be7445e Fix regression in ListView click handling
Regression caused by patch a607223f34

If an item click handler results in the ListView becoming detached
from the window, the performClick runnable could be executed twice.
Null out the mTouchModeReset runnable before running the click handler
so that it is not run by the detach handler.

Change-Id: I2fab60232027bb4876f9912088e0ffb9b17d308c
2012-12-11 15:56:10 -08:00
You Kim
8f5691fd92 Add return after NULL check in JetPlayer
When pointer lpJet is NULL, it should return.

Change-Id: Ia0471173b57da8f9bf22b3a19479aa5b3c4a5acb
2012-12-12 05:34:21 +09:00
Emma Sajic
ef2277ec58 Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
Fix for Issue ID 18316. Make isEmpty() return false when getCount() returns a non-zero value. So that the list cannot be considered empty when a header or footer is present.

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

Change-Id: Ib69201e9d5ef3efcbb68ea298b8cc8ca6e027246
Signed-off-by: Emma Sajic <esajic@effectivelateralsolutions.co.uk>
2012-12-11 19:50:58 +00:00
You Kim
b6ac9e50cf Possible leak in android_emoji_EmojiFactory_newInstance
jchars is not released correctly if factory is NULL.
In addition, unnecessary string conversion removed.

Change-Id: I3ea58391dfe7a96ea6d6ae61bb0867a2d8d49fb0
2012-12-12 00:57:57 +09:00
Wink Saville
7419905676 Merge "Add config_speed_up_audio_on_mt_calls option" 2012-12-10 17:03:46 -08:00
Wink Saville
e22217c278 Merge "Telephony: Use IccUtils from uicc package" 2012-12-10 14:13:18 -08:00
Adam Powell
d692c2c685 Merge "Fix EventLog string class problem in onOptionMenuSelected" 2012-12-10 11:09:32 -08:00
Alex Yakavenka
5d35fcfc32 Telephony: Use IccUtils from uicc package
Change-Id: I80204a2f3dc57cac875abeab390bb9db7a636ff7
2012-12-10 10:35:08 -08:00