Commit Graph

19310 Commits

Author SHA1 Message Date
Konstantin Lopyrev
a06eec8660 Merge "Fix focus notification" into gingerbread 2010-08-09 17:03:10 -07:00
Konstantin Lopyrev
cbceb6f2f2 Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 2010-08-09 17:02:39 -07:00
Dianne Hackborn
bf71a84273 Merge "This may fix LoaderManager bug where a closed cursor could be used." 2010-08-09 16:57:18 -07:00
Jean-Michel Trivi
c2fab76f69 Merge "Fix bug 2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread 2010-08-09 14:19:08 -07:00
Jaikumar Ganesh
4d021abf6c Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 2010-08-09 13:50:28 -07:00
James Dong
f13b68e556 Merge "Support multiple PPS and SPS in avcC box" into gingerbread 2010-08-09 13:35:54 -07:00
Mike Lockwood
59b0371315 Merge "MTP: Fix reading and writing property descriptors" 2010-08-09 11:55:40 -07:00
Mike Lockwood
987b0dca6c Merge changes Ia95ff014,Ib31708c3
* changes:
  MTP: Add debug code for printing names of MTP format and property codes.
  MTP: Fix some typos
2010-08-09 11:38:29 -07:00
Andreas Huber
daae89bc67 Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread 2010-08-09 11:30:34 -07:00
Eric Laurent
df60362e87 Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread 2010-08-09 10:42:27 -07:00
Maksymilian Osowski
a3b837c081 Merge "Added crash-detection mechanism." 2010-08-09 06:36:39 -07:00
Romain Guy
0ff0b453b5 Merge "Enforce maximum texture size." 2010-08-07 23:49:15 -07:00
Romain Guy
1be8845d23 Merge "Prevent memory leak with ComposeShader." 2010-08-07 23:05:57 -07:00
Dan Egnor
a8c319bae6 am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52'

* commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 19:07:24 -07:00
Andreas Huber
bf08de9e54 am c143ae7e: am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Merge commit 'c143ae7eb74205eb2b71e63479988b9913956687'

* commit 'c143ae7eb74205eb2b71e63479988b9913956687':
  Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
2010-08-06 19:06:56 -07:00
Andreas Huber
92fc72f95c am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55'

* commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55':
  Properly skip the 'skip' chunk in mpeg4 files.
2010-08-06 19:06:52 -07:00
Steve Howard
89fcd03e94 am d49d4031: am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit 'd49d4031d654398904d5af30c488a3b32b176122'

* commit 'd49d4031d654398904d5af30c488a3b32b176122':
  Slight improvement (hopefully) to orientation sensing.
2010-08-06 19:06:48 -07:00
Konstantin Lopyrev
83a638af1e am 443f9baf: am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8'

* commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8':
  Adding a way for Hierarchy Viewer to get the focused window.
2010-08-06 19:06:44 -07:00
Steve Howard
9e2b418b1a am f0857005: (-s ours) am db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
Merge commit 'f0857005b25c59b0135977b5d869be16232a1e50'

* commit 'f0857005b25c59b0135977b5d869be16232a1e50':
  New drawables for the update to the maps API (DO NOT MERGE)
2010-08-06 19:06:40 -07:00
Steve Howard
f344276f36 am 974c993f: am 8e15afe7: Make downloads visible by default.
Merge commit '974c993fc3771169efa73e40981d18ac0969fac8'

* commit '974c993fc3771169efa73e40981d18ac0969fac8':
  Make downloads visible by default.
2010-08-06 19:06:31 -07:00
Kenny Root
404b6473e9 am d7ce227b: am 818490ab: Fix String8::operator+
Merge commit 'd7ce227bcb854f048124bbc487eba844c6599142'

* commit 'd7ce227bcb854f048124bbc487eba844c6599142':
  Fix String8::operator+
2010-08-06 19:04:09 -07:00
Dan Egnor
2a6e502ea2 am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp

* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:59:49 -07:00
Dan Egnor
6f678531b9 am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread

* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:55:05 -07:00
Andreas Huber
545fc38ee0 am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Merge commit 'ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp

* commit 'ad98d383a04fce08a147b200e23b12f12b2681a3':
  Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
2010-08-06 18:54:31 -07:00
Andreas Huber
2e7237c51f am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp

* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
  Properly skip the 'skip' chunk in mpeg4 files.
2010-08-06 18:54:26 -07:00
Steve Howard
d7fe288c9b am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit '9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp

* commit '9fbf00cb041eeb22acad93deace9712c57b4c594':
  Slight improvement (hopefully) to orientation sensing.
2010-08-06 18:54:22 -07:00
Konstantin Lopyrev
4f76b3aece am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp

* commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
  Adding a way for Hierarchy Viewer to get the focused window.
2010-08-06 18:54:18 -07:00
Steve Howard
a67f431faf am db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
Merge commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp

* commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
  New drawables for the update to the maps API (DO NOT MERGE)
2010-08-06 18:54:13 -07:00
Steve Howard
01246bd9bb am 8e15afe7: Make downloads visible by default.
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp

* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
  Make downloads visible by default.
2010-08-06 18:54:03 -07:00
Kenny Root
d0be18bd4e am 818490ab: Fix String8::operator+
Merge commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c' into gingerbread-plus-aosp

* commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c':
  Fix String8::operator+
2010-08-06 18:53:48 -07:00
Dan Egnor
df78a0982c Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo 2010-08-06 16:39:02 -07:00
Jason Sams
e322821e00 Merge "Fix debugging support for float vectors and add matrix debugging." 2010-08-06 16:24:15 -07:00
Paul Eastham
d9e7b7f430 Merge "Add support for playing a sound before/after dumpstate." 2010-08-06 16:12:55 -07:00
Andreas Huber
ce4a755725 Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread 2010-08-06 15:21:47 -07:00
Alex Sakhartchouk
a52f740244 Merge "Added drop shadow renderer to the font class." 2010-08-06 15:05:40 -07:00
Steve Howard
4a32a42290 Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread 2010-08-06 14:28:37 -07:00
Konstantin Lopyrev
a96dc98b46 Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread 2010-08-06 14:10:29 -07:00
Daniel Sandler
67ca6697d4 Merge "Fix startup crash on phones." 2010-08-06 12:07:17 -07:00
Romain Guy
c71b6d05d5 Merge "Fix incorrect memory cleanup in SkiaShader." 2010-08-06 10:58:07 -07:00
Michael Kolb
b0bbeef853 Merge "added scroll control support to WebView" 2010-08-06 10:18:41 -07:00
John Huang
01c2c3e634 Merge "Add supporting MCC=450(Korea)" 2010-08-06 10:02:08 -07:00
Mike Lockwood
ef0d9120a6 Merge "Set umask of system server to 0077" 2010-08-06 09:40:54 -07:00
Nipun Kwatra
1d9f493fa8 Merge "When using still camera for time lapse capture, don't set preview." 2010-08-06 09:02:11 -07:00
Kenny Root
aa966638b9 Fix String8::operator+
The LHS was ignored when using:
  String8 + String8
  String8 + (const char*)

Add unit tests for above.

Bug: 2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
2010-08-06 09:00:10 -07:00
Maksymilian Osowski
c33500b0b7 Merge "Added detection of missing EventSender functions." 2010-08-06 08:11:15 -07:00
Mike Lockwood
9fc76a9933 am 19be0bd0: am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
Merge commit '19be0bd07e348fc405e1c46a698843695fc64e48'

* commit '19be0bd07e348fc405e1c46a698843695fc64e48':
  GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:44:28 -07:00
Mike Lockwood
e3be33998d am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
Merge commit '5723dfe8c87d0887b8926f43637ed300466890d2' into gingerbread-plus-aosp

* commit '5723dfe8c87d0887b8926f43637ed300466890d2':
  GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:41:44 -07:00
Chia-chi Yeh
3c77a616db am 69a8d4a8: am 4c5d28ce: RTP: move into frameworks.
Merge commit '69a8d4a8723d5c9fd7d93a15d09b3809cd56f50a'

* commit '69a8d4a8723d5c9fd7d93a15d09b3809cd56f50a':
  RTP: move into frameworks.
2010-08-05 23:19:42 -07:00
Chia-chi Yeh
709067f309 am 4c5d28ce: RTP: move into frameworks.
Merge commit '4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8' into gingerbread-plus-aosp

* commit '4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8':
  RTP: move into frameworks.
2010-08-05 23:17:23 -07:00
Chung-yih Wang
8f6497b1e0 Merge "Fix the SipPhone codes related to the ITelephone interface change." 2010-08-05 22:47:09 -07:00