92910 Commits

Author SHA1 Message Date
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
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
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
Christopher Tate
d51ffbea94 am faeabc7b: Merge "Cache resource ID lookups in aapt"
* commit 'faeabc7bcf760a4576637551d8bb578ae08a506e':
  Cache resource ID lookups in aapt
2012-11-27 18:40:43 -08:00
Christopher Tate
faeabc7bcf Merge "Cache resource ID lookups in aapt" 2012-11-27 18:30:05 -08:00
Christopher Tate
d8dde13a63 Cache resource ID lookups in aapt
This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK.  Windows-based
use should particularly benefit from the change.

Change-Id: I29f4b3a77400b201ee219729cc28a5e359c0c5e8
2012-11-27 18:28:49 -08:00
Yoshihiko Ikenaga
9348005545 Try go-negotiation when invocation request is deferred.
Devices setting persistent_reconnect to 0 in wpa_supplicant returns "information is currently unable" error.
In that case, the connection establishment was always failed when the other device does NOT handle the invitation request.
So, try go-negotiation for interoperability.

Change-Id: Ia30a1c63d1bb4acc186a71248fb0aa5ea7edc627
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-11-28 09:52:06 +09:00
Sangkyu Lee
7bb3cfe1cc Another optimization of glyph cache uploads
Previously, cache textures were updated whenever mCurrentCacheTexuture was changed.
Since updating cache textures needs glTexSubImage2D call, frequent changing
of mCurrentCacheTexture (which can easily happen when an app uses lots of unique glyphs
even with precaching) caused many glTexSubImage2D calls and bad framerates.
This patch optimized isssueDrawCommand function. Consequently, changing mCurrentCacheTexture doesn't
cause glTexSubImage2D call any more and it will improve font rendering performance.

Change-Id: Id19d959fa0e69eeb2a39f83a57e311d7394586b2
Signed-off-by: Sangkyu Lee <geteuid@gmail.com>
2012-11-28 09:28:50 +09:00
Kenny Root
ae0edeb3e5 am c88047bf: Merge "Move NTP updates outside locks"
* commit 'c88047bf86fd83e5b0204d26b35776cad97ed877':
  Move NTP updates outside locks
2012-11-27 12:57:54 -08:00
Kenny Root
c88047bf86 Merge "Move NTP updates outside locks" 2012-11-27 11:54:31 -08:00
Irfan Sheriff
10c29234aa am 13fd8919: Merge "Fixed typo and space."
* commit '13fd8919bd3e1a314cf00a3e9299dbcac8c3cd7f':
  Fixed typo and space.
2012-11-27 11:21:46 -08:00
Irfan Sheriff
13fd8919bd Merge "Fixed typo and space." 2012-11-27 10:39:26 -08:00
Chet Haase
d8a6b5445c am 21243369: Merge "Fix infinite recursive loop"
* commit '2124336984cb6c189f03c271636a1cc8babb2371':
  Fix infinite recursive loop
2012-11-27 09:37:23 -08:00
Chet Haase
2124336984 Merge "Fix infinite recursive loop" 2012-11-27 08:34:18 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
2012-11-27 08:21:11 -08:00
Svetoslav Ganov
abb4a7008a Update the content shell command's usage instructions.
The usage instructions of the content shell command were missing some
excape charecters which caused the examples not to work. As a result
of the incorrect instructions users are prone to constructing incorrect
commands.

bug:7526252

Change-Id: I2fcc4dd1fd05806fe951245651b97e40a4786d24
2012-11-26 09:50:51 -08:00
Johan Redestig
636c0ff499 Make transactGetSockaddr locale safe
Explicitly use Locale.US transactGetSockaddr to avoid
unexpected results in some locales.

Change-Id: If8316e543e21e133dc0c821cc390a2b55fe6fcdf
2012-11-23 11:19:20 +01:00
Baligh Uddin
f7f1c6a78e Import translations. DO NOT MERGE
Change-Id: I9f2a464733eb765385c3f8f83bbcd1a1e33b0e26
Auto-generated-cl: translation import
2012-11-22 21:52:46 -08:00
László Dávid
c5d43f76fd Fix infinite recursive loop
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
2012-11-23 00:26:22 +01:00
You Kim
43a5070e06 resolver list is not cleared on rebuild
Refactoring ResolverActivity.java

Change-Id: I84e6420ff98ddcafd27a52b041ddb1c50e7d7362
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-11-21 23:23:45 +09:00