Andreas Huber
a9307bef53
Merge "Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer"
2011-08-04 15:20:24 -07:00
Gloria Wang
09337a07fa
resolved conflicts for merge of 845fdba7 to master
...
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
2011-08-04 15:13:14 -07:00
Andreas Huber
e38a2cba16
Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer
...
Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug: 5122973
2011-08-04 15:05:17 -07:00
Wink Saville
628b08530a
Delay connectivity change notifications.
...
Because changes to the route tables take time to propagate
we add a delay when sending out change notifications. This allows
applications, such as GTalk, to create sockets without encountering
a 3 minute timeout.
Bug: 5008488
Change-Id: I0eefb03a5d6358a58ea6ae5b4f697ff302b5511d
2011-08-04 15:01:58 -07:00
Steve Block
03f8fcb8b0
am c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
...
* commit 'c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
Cherry-pick DeviceMotionService CL from master [do not merge]
2011-08-04 14:49:44 -07:00
Gloria Wang
845fdba7b5
am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
...
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
2011-08-04 14:47:43 -07:00
Gloria Wang
8a6fb50d69
am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
...
* commit '4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
Bug fixes in OMA DRM v1 Forward Lock Agent
2011-08-04 14:36:45 -07:00
Gloria Wang
4e197ea8a6
am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
...
* commit 'e15a73ee4c9a28d89888095c7649a70c116ee160':
Bug fixes in OMA DRM v1 Forward Lock Agent
2011-08-04 14:33:06 -07:00
Amith Yamasani
b47c4fd206
Don't call onQueryTextChanged more often than necessary.
...
Also update the hint text if iconifiedByDefault changes.
Bug: 5097238
Change-Id: I876b3f3e74c30230f68d6bc88a95e182e4cc652b
2011-08-04 14:30:07 -07:00
Gloria Wang
e15a73ee4c
Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
2011-08-04 14:20:53 -07:00
Chet Haase
b8f574a165
Fix AnimatorSet cancellation issues
...
AnimatorSet was incorrectly ignoring cancel() when it was in the
initial startDelay phase. Fix is to change isRunning() to be true if the
animator is also in its delay phase.
Change-Id: I1a8c877de24fa294beea0ba30d495658255b13b3
2011-08-04 14:16:48 -07:00
Jean-Michel Trivi
e83af902c4
Merge "Remove empty remote control client listener methods"
2011-08-04 14:10:57 -07:00
Adam Powell
b491877331
Merge "Fix bug 5121406 - ActionBar.setLogo"
2011-08-04 13:21:07 -07:00
Adam Powell
29764eab44
Fix bug 5121406 - ActionBar.setLogo
...
Make the resource ID version of setLogo work.
Change-Id: I0a710b714c9fd10bc3063a8ec95e59391ba4d4e0
2011-08-04 13:12:01 -07:00
Chia-chi Yeh
b234636105
Merge "VPN: move away from the VPN permission."
2011-08-04 13:04:51 -07:00
Andreas Huber
e30d6f1588
Merge "Restart HLS streaming from the bottom of the playlist if we miss the boat on the"
2011-08-04 12:57:45 -07:00
Daniel Sandler
f48fd822e0
Fix another NPE.
...
Bug: 5122306
Change-Id: I6877528325d30bb725f8692c86a8752263b5344e
2011-08-04 15:57:39 -04:00
Xavier Ducrohet
14434ed6e7
am 23ce76ce: am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound."
...
* commit '23ce76ce1666e5e8b0b17825c271b133ba2626d6':
Insert a break wraparound.
2011-08-04 12:56:46 -07:00
Xavier Ducrohet
23ce76ce16
am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound."
...
* commit '320834c9e02364b39b98b610f1d2244cbb9a4f26':
Insert a break wraparound.
2011-08-04 12:54:49 -07:00
Xavier Ducrohet
320834c9e0
am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound."
...
* commit 'b9e8b25e9066d6f2da0635eaac524246b729fbfa':
Insert a break wraparound.
2011-08-04 12:52:34 -07:00
Xavier Ducrohet
b9e8b25e90
am 6b3a0123: Merge "Insert a break wraparound."
...
* commit '6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
Insert a break wraparound.
2011-08-04 12:50:11 -07:00
Xavier Ducrohet
6b3a012348
Merge "Insert a break wraparound."
2011-08-04 12:36:11 -07:00
Xavier Ducrohet
b7ef4cb254
Merge "Layoutlib: implement Resources.getBoolean(int)."
2011-08-04 12:18:17 -07:00
Andreas Huber
323e31754c
Restart HLS streaming from the bottom of the playlist if we miss the boat on the
...
next segment. This can happen if for whatever reason we playback video slower than
it is served.
Also removed some unnecessary verbosity from ChromiumHTTPDataSource.
Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79
related-to-bug: 5120425
2011-08-04 12:10:29 -07:00
Amith Yamasani
effdfbcef7
SearchView asset changes.
...
Bug: 5116070
Change-Id: Ife55a253f741cfeae9c287d5f913f3a158a34fd2
2011-08-04 12:04:05 -07:00
Steve Block
c4d93ba55f
Cherry-pick DeviceMotionService CL from master [do not merge]
...
In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering.
cherry-pick of Change: d09001fea476ca6c6eaff5e29a1bb6f3aebe5bd5
Bug: 5110230
Change-Id: Id1d1f51b445ce4a14bfcdfad8f173922e01b6563
2011-08-04 10:59:59 -07:00
Adam Powell
0a2a287987
Merge "Fix bug 5073637 - Market apps crashing FastScroller"
2011-08-04 10:51:57 -07:00
Adam Powell
568ccd88d7
Fix bug 5073637 - Market apps crashing FastScroller
...
It seems that some popular Market apps do not properly implement
SectionIndexer#getSectionForPosition and the framework did not
previously call it. Revert to more simplistic scrollbar behavior for
apps targeting sdk < Honeycomb.
Change-Id: If0b1f2b4db540de4bb8ba45798e498c09cddb42f
2011-08-04 10:36:37 -07:00
Isaac Levy
d2fe04b71a
Rewrote DnsPinger - now is async and concurrant
...
Change-Id: I93e1374ae857832935202614e34ce18f040fcfc7
2011-08-04 10:35:29 -07:00
Irfan Sheriff
aead35a850
Merge "Fix p2p package paths"
2011-08-04 10:29:23 -07:00
Jean-Michel Trivi
a30a21cf2e
Remove empty remote control client listener methods
...
Remove non-implemented methods for registering IRemoteControlClient
listeners.
Rename refreshRemoteControlDisplay() method to follow framework
conventions.
Change-Id: I9254e8eeea9020a530c9a32f328f0ef7dbd9dd0c
2011-08-04 10:28:07 -07:00
Fabrice Di Meglio
e0511bf055
Merge "Fix bug #5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR"
2011-08-04 10:09:24 -07:00
Daniel Sandler
d3ffa270e0
Merge "Log some signal condition diagnostics for now."
2011-08-04 09:56:53 -07:00
Daniel Sandler
e0018cc790
Merge "Crushing Dreams."
2011-08-04 09:46:45 -07:00
Mike Lockwood
f9430aba1a
Merge "Resolve merge conflict for '75f1fdec':"
2011-08-04 09:46:09 -07:00
Russell Brenner
adc25267f8
Merge "Adapt TextLayoutCache for new Harfbuzz scripts"
2011-08-04 09:41:53 -07:00
Debashish Chatterjee
fd827ed24a
Merge "Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base."
2011-08-04 09:34:25 -07:00
Daniel Sandler
f91f0905e4
Merge "Fix NPE on first-ever boot if display has rotated."
2011-08-04 08:46:20 -07:00
Daniel Sandler
8d77e7714b
Merge "Restore DISABLE_NOTIFICATION_ICONS."
2011-08-04 08:44:51 -07:00
Mike Lockwood
2b15cb21b3
Resolve merge conflict for '75f1fdec':
...
GPS Provider Service changes
GPS engine needs to receive network state changes from Android fw.
Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService
Conflicts:
services/java/com/android/server/location/GpsLocationProvider.java
Change-Id: I33c45027f1571493d3525324f62d199517c4960c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-04 11:40:25 -04:00
Mike Lockwood
75f1fdec3e
am 0b3af353: am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes"
...
* commit '0b3af353dcf61177158934a11404cf2914038696':
GPS Provider Service changes
2011-08-04 07:53:53 -07:00
Mike Lockwood
0b3af353dc
am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes"
...
* commit 'a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
GPS Provider Service changes
2011-08-04 07:51:38 -07:00
Debashish Chatterjee
e53eba0470
Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base.
...
This permission has now been replaced by ADD_VOICEMAIL.
Bug: 5098551
Change-Id: Idc993f1674a66f0df3ec699ed14b2e5cfedfe3e8
2011-08-04 15:49:04 +01:00
Mike Lockwood
a82ee49a7b
am 8f5dd9ad: Merge "GPS Provider Service changes"
...
* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
GPS Provider Service changes
2011-08-04 07:48:57 -07:00
Mike Lockwood
8f5dd9ad3f
Merge "GPS Provider Service changes"
2011-08-04 07:39:03 -07:00
Kevin Tang
a5fe6b2efe
GPS Provider Service changes
...
GPS engine needs to receive network state changes from Android fw.
Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService
Change-Id: I62e35c948d2ac1961771d1a10581a3b8e695c05a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-04 10:33:35 -04:00
Svetoslav Ganov
47e02711d7
ACTION_HOVER_EXIT sometimes not delivered during touch exploration.
...
1. The code for detecting the end of a touch exploration gesture
was not injecting the hover exit event upon detection of the
gesture end.
bug:5091758:
Change-Id: I468164617d6677cd2a2a2815e1756c826d49f3a9
2011-08-04 06:34:37 -07:00
Svetoslav Ganov
e4aa13b201
AccessibilityEvent#toString() always reports -1 for record count.
...
1. The implementation of toString() was calling a wrong method
for the record count.
bug:5087078
Change-Id: I4ca79faa6ccce135eb6fe797de7b08e30f8b3e71
2011-08-04 06:30:33 -07:00
Svetoslav Ganov
7abaecc3db
Merge "Removing firing of spurious scroll accesibility events."
2011-08-04 05:55:46 -07:00
Svetoslav Ganov
2c44b9221b
Merge "No selection or click accessibility events are fired when a list item is tapped."
2011-08-04 05:55:26 -07:00