92929 Commits

Author SHA1 Message Date
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
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
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
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
Nick Kralevich
261bc70411 Merge "convert jint to uint32_t." 2012-12-10 09:44:24 -08:00
zobject
332944f8a0 Fix EventLog string class problem in onOptionMenuSelected
EventLog function can handle string,integer class and long class. (in android_util_EventLog.cpp)
If menu title string are used bold tag(like <b>test</b>), it'll be android.text.SpannedString.
In onOptionMenuSelected, it is using item.getTitleCondensed() function for writing event log.
therefore any android activity using tag menu string(like <b></b>) can be crashed by IllegalArgumentException.

I found this crash on GMS Application.
change locale chinese -> launch Google+ -> hangout -> menu key -> Invite(expressed chinese) click -> Google+ crash

Change-Id: I0437be81699925e29bf4510eb615ef2424432763
2012-12-10 23:19:45 +09:00
Wink Saville
be5316e012 Merge "Use Rlog" 2012-12-08 12:11:34 -08:00
Wink Saville
22b1e80c24 Use Rlog
Change-Id: I44919126606cd55f7dce7c942027ed0d914f04bd
2012-12-08 09:06:51 -08:00
Wink Saville
c43670be2b Merge "Add Rlog.java" 2012-12-08 08:00:26 -08:00
Nick Kralevich
7353cf305e convert jint to uint32_t.
This works around a compiler bug, and is probably more
correct anyway.

Change-Id: I1c49064bd64c31dafae560e416c665de0449f245
2012-12-07 16:56:47 -08:00
Adam Powell
ff411ddb40 Merge "Framework: Use holo alert drawables" 2012-12-07 11:20:08 -08:00
Adam Powell
8ea5ce1565 Merge "Ensure running mTouchModeReset when AbsListView is detached" 2012-12-07 11:19:12 -08:00
Sangkyu Lee
a607223f34 Ensure running mTouchModeReset when AbsListView is detached
mTouchModeReset should be executed when AbsListView is detached from window.
If not, when the AbsListView is re-attaced to window,
the child can retain a pressed state.

You can see this problem easily when you double-touch an item of
option menu very quickly.

Change-Id: I5aaa1fd5b95847efb2f5f1b5ec7cabe8eb85b237
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
2012-12-07 17:06:15 +09:00
Alex Yakavenka
7eabbd552d Add config_speed_up_audio_on_mt_calls option
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
2012-12-06 14:53:58 -08:00
Wink Saville
7ba6a6778e Add Rlog.java
Rlog is like Log except that the destination buffer is
the radio buffer instead of the main buffer.

Change-Id: Ib4ce47abfda31dfc0b9193b10f8f42b225275f61
2012-12-06 13:10:45 -08:00
Victoria Lease
5b6069ce3a Merge "Wrong parameter in LocationManagerService" 2012-12-06 12:45:46 -08:00
You Kim
87c1b3127e Wrong parameter in LocationManagerService
Fix wrong parameter in removeTestProvider

Change-Id: Ibf93833697c865904f29821e5778853127e5fb00
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-12-07 04:33:05 +09:00
Irfan Sheriff
1612e29826 Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 2012-12-05 20:33:37 -08:00
Irfan Sheriff
c602187e51 Merge "Prevent scanning during DHCP process" 2012-12-05 09:25:43 -08:00
Hai Guo
4a68e3c26d fix typo in docs
description of 'android/hardware/Camera.Parameters.html#
    setPreviewFpsRange(int, int)' not right

Change-Id: Ic83c0f404710a0125138df1e2b7663994301aee7
2012-12-05 21:50:28 +08:00
Jeff Sharkey
29afa14240 Remove unnecessary locking for screen broadcasts.
The actual handling occurs in updateScreenOn() on the other side of a
handler, which acquires the lock correctly.

Change-Id: Ibd359446dba8e88f81d34f1e10a6b5e150348f89
2012-12-04 17:21:38 -08:00
Craig Mautner
40627de304 Merge "Remove unnecessary references in WindowManagerService" 2012-12-04 09:45:03 -08:00
You Kim
cb6291c9b1 Remove unnecessary references in WindowManagerService
Clean message routines in WindowManagerService.

Change-Id: I3e3106b6499c67d1fd7133c987c0452a73141a3f
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-12-05 00:10:03 +09:00
Adam Powell
568f923ba4 Merge "removing ineffective code in WifiService.java" 2012-12-03 13:37:16 -08:00
Irfan Sheriff
cdd03f5487 Merge "Try go-negotiation when invocation request is deferred." 2012-12-03 11:59:53 -08:00
Adam Powell
05c8f17f05 Merge "resolver list is not cleared on rebuild" 2012-12-03 11:04:21 -08:00
Daniel Sandler
5046ae5667 Merge "framework: fix notification icons not animating till ticker is updated" 2012-12-03 07:06:29 -08:00
Vitaly Wool
d7fc38cead Prevent scanning during DHCP process
Wi-Fi should be in active state during the entire DHCP process, and
shouldn't go to IEEE 802.11 power save mode. If the framework requests
scan during the DHCP process, the Wi-Fi chip has to start scanning
on channels different from the current one, and going to power save
mode is a prerequisite for scan. The result directly impacts user
experience: DHCP process takes longer, and even can fail.

Change-Id: I8171388bb70072e4c42cb3c074dd955da84e494b
2012-12-03 16:00:44 +01:00
Daniel Bateman
258384aff2 framework: fix notification icons not animating till ticker is updated
Fixes Android issue #15657

Change-Id: If3bb8693d99e3415bcf0fa9adadee5c1bdbb990d
2012-11-30 16:28:54 -08:00
Andreas Huber
2644494a98 Merge changes I8462f040,Ie471f40f
* changes:
  MediaCodec: Allow getting the codec info directly
  MediaCodec: Allow getting the chosen component name
2012-11-30 13:26:51 -08:00
Elliott Hughes
940ad4aaef Merge "Make AudioGroup.add locale safe" 2012-11-30 11:20:23 -08:00
Marco Nelissen
334a36b32c Merge "Change the text color of timer in MediaController" 2012-11-30 09:03:10 -08:00
Roger Chen
56dc91f7ce Change the text color of timer in MediaController
The color of timer and backgroud in MediaController
are too closer to distinguish.

Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2012-11-30 08:58:43 -08:00
Elliott Hughes
9ed4abd875 Merge "Fix AndroidHttpClient documentation error." 2012-11-29 09:23:54 -08:00
Elliott Hughes
820b3e29ca Merge "Make transactGetSockaddr locale safe" 2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error.
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
2012-11-29 08:32:13 -08:00
Chet Haase
25082e3326 Merge "Another optimization of glyph cache uploads" 2012-11-28 14:46:14 -08:00