Marco Nelissen
bb3a8c5ea2
Merge "Allow root to set the mount state as well, so that the simulator can use the fake sd card."
2010-05-25 12:04:03 -07:00
Andreas Huber
19a0913a5b
am 1a777cd4: am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art.
2010-05-25 11:35:18 -07:00
Andreas Huber
1a777cd44a
am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art.
2010-05-25 11:33:39 -07:00
Wink Saville
97692e6da2
Merge "Add needsOtaServiceProvisioning to Phone."
2010-05-25 11:20:30 -07:00
Andreas Huber
c6c62e12c9
Support for ogg(vorbis) metadata in stagefright including album art.
...
Change-Id: I0c8c0136cebe2d2d97caabb7bc0c65be86329dbb
related-to-bug: 2713414
2010-05-25 11:20:29 -07:00
Eric Laurent
de5a036da7
Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume."
2010-05-25 10:25:48 -07:00
Eric Laurent
cc9c4242e3
Fix issue 2641884: Bluetooth volume is dependent on in call volume.
...
The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces
voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream
volume did not actually change. So even if we re apply volumes when switching to bluetooth
device, the volume voice volume is not changed and remains what it was when routed to earpiece
What makes things worse on Passion is that stream volumes are limited when connected to bluetooth
and their actual value does not change as soon as they exceed the limit threshold.
Change-Id: I18265e5e6686db0a1f30fc37a31e2ecde4f3fbc6
2010-05-25 09:31:59 -07:00
Marco Nelissen
584f137c19
Allow root to set the mount state as well, so that the simulator
...
can use the fake sd card.
Change-Id: I9ac5329f976a6e466ef2d7123ca70670975c30e3
2010-05-25 09:05:56 -07:00
Leon Scroggins
eb51f3e340
Check for null before using Layout.
...
Bug 2713024
Change-Id: Iaad5c774fa1e16c341d481104f8fd38f7add3082
2010-05-25 11:33:03 -04:00
Kristian Monsen
dcea182c9a
Merge "Merge WebKit at r59636: Added appcache/fallback.html to the ignore list."
2010-05-25 07:58:40 -07:00
Kristian Monsen
d0a89e3fc0
Merge "Merge WebKit at r59636: Update UA string"
2010-05-25 07:58:33 -07:00
Kristian Monsen
75be797b0c
Merge WebKit at r59636: Added appcache/fallback.html to the ignore list.
...
Change-Id: Ic2cbb9e32022b0f7ee371984691b3c590d05667d
2010-05-25 15:51:22 +01:00
Mike Lockwood
752b14705e
Merge "MTP: adjust ptptest app for changes in libusbhost API."
2010-05-25 05:22:45 -07:00
Mike Lockwood
4f92fffc71
MTP: adjust ptptest app for changes in libusbhost API.
...
Change-Id: I775e08c851a55d775b532129be11fb19515fbf6e
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-05-25 08:12:25 -04:00
Kristian Monsen
02263fd2f0
Merge WebKit at r59636: Update UA string
...
Change-Id: Ic5b0a03ad53f2e81f5aeb6e32b2f92902b83fdb2
2010-05-25 11:11:57 +01:00
Eric Laurent
2ce0a831d6
am 1b88fb16: am cf3fa85c: Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:27:02 -07:00
Eric Laurent
1b88fb1693
am cf3fa85c: Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:24:42 -07:00
Eric Laurent
cf3fa85cdb
Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:23:29 -07:00
Mathias Agopian
c1600ae869
am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail
2010-05-24 19:13:52 -07:00
Mathias Agopian
36893612af
am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail
2010-05-24 19:12:33 -07:00
Mathias Agopian
d6ddcb7f00
fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail
...
force all SurfaceView to 565
Change-Id: I8ebfa1239d8e4fa097c2e544677fb92fa20b39bd
2010-05-24 19:07:08 -07:00
Mathias Agopian
b00d12beae
am 61a58708: am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken
2010-05-24 18:33:35 -07:00
Mathias Agopian
7cce3d3dcd
am 27d2f0ca: am acdc44bb: Merge "fix a bug when reallocating a window\'s buffers is needed" into kraken
2010-05-24 18:33:31 -07:00
Mathias Agopian
61a5870871
am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken
2010-05-24 18:32:05 -07:00
Mathias Agopian
27d2f0caef
am acdc44bb: Merge "fix a bug when reallocating a window\'s buffers is needed" into kraken
2010-05-24 18:31:59 -07:00
Mathias Agopian
2e948ca1a0
Merge "added the notion of fixed-size buffers" into kraken
2010-05-24 18:30:35 -07:00
Mathias Agopian
acdc44bbba
Merge "fix a bug when reallocating a window's buffers is needed" into kraken
2010-05-24 18:30:25 -07:00
Mathias Agopian
2be352adab
added the notion of fixed-size buffers
...
the new native_window_set_buffers_geometry allows
to specify a size and format for all buffers to be
dequeued. the buffer will be scalled to the window's
size.
Change-Id: I2c378b85c88d29cdd827a5f319d5c704d79ba381
2010-05-24 18:26:01 -07:00
Wink Saville
4d8ae85b5d
Add needsOtaServiceProvisioning to Phone.
...
By having needsOtaServiceProvisioning supported on all phones we
eliminate the need to use an if statement to discriminate phone type.
Types of phones that don't support OTASP will return false in the
default implementation in PhoneBase.
Change-Id: I8fb15a18553e314c1f8f2a00ec7f8cffd79eeb7f
2010-05-24 17:50:32 -07:00
Konstantin Lopyrev
3255823de0
Fix 2673731: Adding support for password history to Device Admin.
...
Change-Id: If3240048813e32b2bae79fe5cb8a73aea20ec56c
2010-05-24 17:13:18 -07:00
Adam Powell
e46c1e817c
am 49551ca4: am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:30:16 -07:00
Adam Powell
49551ca41e
am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:28:20 -07:00
Adam Powell
9a559970a3
am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
...
Merge commit 'f67c874c07d2e0ff888cc88679f884a833f89870' into kraken
* commit 'f67c874c07d2e0ff888cc88679f884a833f89870':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:26:06 -07:00
Adam Powell
f67c874c07
am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
...
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:23:53 -07:00
Adam Powell
7e5e3745cf
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
...
Change-Id: I21b37647c5ad16e4f57fdda433e3b3ee2c7c83ad
2010-05-24 15:13:41 -07:00
Mark Vandevoorde
2b4140ef1b
am a5437f2d: am 88437284: Fix build error (Boolean -> boolean)
2010-05-24 13:47:47 -07:00
Mathias Agopian
57d89899c9
fix a bug when reallocating a window's buffers is needed
...
we need to mark the buffers that need to be reallocated,
NOT the buffer's indices.
Change-Id: I809e2e1b03b56c4d2ab983c25523dae99aa1da74
2010-05-24 13:47:24 -07:00
Mark Vandevoorde
a5437f2d94
am 88437284: Fix build error (Boolean -> boolean)
2010-05-24 13:45:42 -07:00
Mark Vandevoorde
884372842b
Fix build error (Boolean -> boolean)
...
Change-Id: I2f337e23f4b092de41523f1195546e9d65851c84
2010-05-24 13:40:22 -07:00
Mike Lockwood
7df535b976
am 749afee8: am 1e11e95f: Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 13:03:22 -07:00
Mike Lockwood
749afee8bd
am 1e11e95f: Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 13:01:21 -07:00
Mike Lockwood
1e11e95f61
Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 12:59:27 -07:00
James Dong
dd5993a4e9
am f09cab8c: am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken
2010-05-24 10:56:31 -07:00
James Dong
f09cab8cb0
am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken
2010-05-24 10:55:28 -07:00
James Dong
6c537e53ce
Merge "Properly handle start code in H264/AVC encoder output" into kraken
2010-05-24 10:54:25 -07:00
Dirk Dougherty
0d764b01d1
am 1586f713: am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:05:14 -07:00
Dirk Dougherty
1586f7133e
am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:03:29 -07:00
Dirk Dougherty
b59fbafe5d
am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
...
Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken
* commit '3cffe1ababdb09f4a90274e25c2f66feee299835':
Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:01:49 -07:00
Andreas Huber
c21c1900e5
am ec5f8241: am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever...
2010-05-24 10:00:10 -07:00
Andreas Huber
ec5f8241ec
am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever...
2010-05-24 09:58:02 -07:00
