OSDN Git Service
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:49:37 +0000 (08:49 -0800)]
am
a218e014: reconcile with open-source gingerbread
* commit '
a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
Wink Saville [Thu, 9 Dec 2010 22:02:09 +0000 (14:02 -0800)]
am
d0ffef4b: am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
d0ffef4b43594e540cb867da18d4403b4f583622':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:58:26 +0000 (13:58 -0800)]
am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:50:28 +0000 (13:50 -0800)]
Merge "Fix for phone app crash in Icc Card."
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:45:29 +0000 (10:45 -0800)]
am
d9c17cc1: merge from gingerbread
* commit '
d9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:23 +0000 (10:18 -0800)]
reconcile with open-source gingerbread
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:06 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
Wink Saville [Thu, 9 Dec 2010 05:57:03 +0000 (21:57 -0800)]
am
0a5ae453: am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
0a5ae453e50144b31c7f544714feb5bbc7b77d18':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:53:24 +0000 (21:53 -0800)]
am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:37:38 +0000 (21:37 -0800)]
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
Mathias Agopian [Thu, 9 Dec 2010 00:20:23 +0000 (16:20 -0800)]
am
e1752f41: Merge "fix [
3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit '
e1752f41d34249c891564889b07963262b1bd8bf':
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
James Dong [Thu, 9 Dec 2010 00:20:16 +0000 (16:20 -0800)]
am
1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
* commit '
1f5b133ae29090f1807be392874f6b7a5d92c6d4':
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
Mathias Agopian [Thu, 9 Dec 2010 00:17:02 +0000 (16:17 -0800)]
Merge "fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
Mathias Agopian [Thu, 9 Dec 2010 00:15:08 +0000 (16:15 -0800)]
am
74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
* commit '
74da537f80ba36c1279c04fcb85d89fc38c246a6':
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
James Dong [Thu, 9 Dec 2010 00:14:27 +0000 (16:14 -0800)]
Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
Mathias Agopian [Wed, 8 Dec 2010 23:34:02 +0000 (15:34 -0800)]
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.
Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
Mathias Agopian [Wed, 8 Dec 2010 23:08:33 +0000 (15:08 -0800)]
Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread
Brad Fitzpatrick [Wed, 8 Dec 2010 21:23:03 +0000 (13:23 -0800)]
am
36af7943: Fix malformed Javadoc.
* commit '
36af79434fb62c26238132eaeda2ec5e732f3c2f':
Fix malformed Javadoc.
Nick Pelly [Wed, 8 Dec 2010 06:57:23 +0000 (22:57 -0800)]
am
40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
* commit '
40ddd4a64908c0cbe4970d2ba1703f74717620a8':
Implemented getSize() to return max ndef size.
Nick Pelly [Wed, 8 Dec 2010 06:55:21 +0000 (22:55 -0800)]
Merge "Implemented getSize() to return max ndef size." into gingerbread
Martijn Coenen [Wed, 8 Dec 2010 06:35:01 +0000 (22:35 -0800)]
am
5289b91c: Implement ndef formatting.
* commit '
5289b91c885158094988a9a7b51b3139565eb639':
Implement ndef formatting.
Wink Saville [Wed, 8 Dec 2010 06:22:01 +0000 (22:22 -0800)]
am
a00d89e8: am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
a00d89e824c523c51955176b61e50472828fd8b1':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Wink Saville [Wed, 8 Dec 2010 06:18:14 +0000 (22:18 -0800)]
am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Dianne Hackborn [Wed, 8 Dec 2010 06:07:40 +0000 (22:07 -0800)]
am
42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
* commit '
42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
Add more checks for bad values to protect from corrupt files.
Dianne Hackborn [Wed, 8 Dec 2010 06:04:38 +0000 (22:04 -0800)]
Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
Wink Saville [Wed, 8 Dec 2010 05:57:53 +0000 (21:57 -0800)]
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
Mathias Agopian [Wed, 8 Dec 2010 05:00:25 +0000 (21:00 -0800)]
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
In some situations, the screen transformation would not be
applied while in bypass mode.
Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
Mathias Agopian [Tue, 7 Dec 2010 22:22:56 +0000 (14:22 -0800)]
am
a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
* commit '
a2977c383d363e1e88a5b36230b1fa4c312807d2':
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
Mathias Agopian [Tue, 7 Dec 2010 22:20:14 +0000 (14:20 -0800)]
am
05813b0e: Merge changes I244b5469,I32044e91 into gingerbread
* commit '
05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
[
3253328,
3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[
3171580] Fix two typos related to fixed-size buffers
Mathias Agopian [Tue, 7 Dec 2010 22:20:09 +0000 (14:20 -0800)]
am
4153bf3a: Merge "[
3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread
* commit '
4153bf3a259624a2f2dc497b77b225a1fb517abc':
[
3171580] don't automatically log GraphicBuffer allocation failures
Mathias Agopian [Tue, 7 Dec 2010 22:18:56 +0000 (14:18 -0800)]
Merge changes Ie03796ae,Ide3e980a into gingerbread
* changes:
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
Mathias Agopian [Tue, 7 Dec 2010 22:18:21 +0000 (14:18 -0800)]
Merge changes I244b5469,I32044e91 into gingerbread
* changes:
[
3253328,
3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[
3171580] Fix two typos related to fixed-size buffers
Mathias Agopian [Tue, 7 Dec 2010 22:17:47 +0000 (14:17 -0800)]
Merge "[
3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread
Jeff Hamilton [Tue, 7 Dec 2010 22:04:40 +0000 (14:04 -0800)]
am
0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread
* commit '
0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
Remove Type X Tags from the top-level API.
Daniel Sandler [Tue, 7 Dec 2010 22:01:31 +0000 (14:01 -0800)]
am
f340d082: Merge "More precise status bar battery icons." into gingerbread
* commit '
f340d082b8488de6f131c1e5932cd3abc16b47c1':
More precise status bar battery icons.
Jeff Hamilton [Tue, 7 Dec 2010 21:59:29 +0000 (13:59 -0800)]
Merge "Remove Type X Tags from the top-level API." into gingerbread
Jean-Baptiste Queru [Tue, 7 Dec 2010 21:02:22 +0000 (13:02 -0800)]
am
12902d68: resolved conflicts for merge of
78742e01 to stage-korg-master
* commit '
12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
Strings for NI position request are moved to resources
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:47:12 +0000 (12:47 -0800)]
resolved conflicts for merge of
78742e01 to stage-korg-master
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
Daniel Sandler [Tue, 7 Dec 2010 20:03:36 +0000 (12:03 -0800)]
Merge "More precise status bar battery icons." into gingerbread
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:01:25 +0000 (12:01 -0800)]
Merge "Strings for NI position request are moved to resources"
Nick Pelly [Tue, 7 Dec 2010 17:34:47 +0000 (09:34 -0800)]
am
47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '
47e6ccb65ab0088cf04809c234cdb5f747579c8c':
Corrected MIFARE default key set
Nick Pelly [Tue, 7 Dec 2010 17:29:21 +0000 (09:29 -0800)]
Merge "Corrected MIFARE default key set" into gingerbread
Chung-yih Wang [Tue, 7 Dec 2010 06:10:29 +0000 (22:10 -0800)]
am
5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit '
5f86d7f50beba9f6327b8a04defe4e989a153d4a':
Fix SIP bug of different transport/port used for requests.
Chung-yih Wang [Tue, 7 Dec 2010 06:07:59 +0000 (22:07 -0800)]
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
Dirk Dougherty [Tue, 7 Dec 2010 03:44:36 +0000 (19:44 -0800)]
am
0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '
0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
Doc change: fix href to axis_globe_inverted orientation diagram.
Martijn Coenen [Tue, 7 Dec 2010 02:48:02 +0000 (18:48 -0800)]
am
9a9706a2: Added missing ndef technology to getTech.
* commit '
9a9706a213637b396226afff53c69927283609a7':
Added missing ndef technology to getTech.
Nick Pelly [Tue, 7 Dec 2010 02:44:13 +0000 (18:44 -0800)]
am
e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
* commit '
e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
Added NdefFormatable tag, initial class with supported methods.
Nick Pelly [Tue, 7 Dec 2010 02:41:36 +0000 (18:41 -0800)]
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
Mathias Agopian [Tue, 7 Dec 2010 02:22:57 +0000 (18:22 -0800)]
am
daef0a04: Merge "[
3229973,
3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
* commit '
daef0a040de7a9825bdbcba7b2eae66195e3a95f':
[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL
Mathias Agopian [Tue, 7 Dec 2010 02:20:09 +0000 (18:20 -0800)]
Merge "[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
Nick Pelly [Tue, 7 Dec 2010 01:45:25 +0000 (17:45 -0800)]
am
eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit '
eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
Nick Pelly [Tue, 7 Dec 2010 01:43:46 +0000 (17:43 -0800)]
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
James Dong [Mon, 6 Dec 2010 23:36:04 +0000 (15:36 -0800)]
am
d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '
d57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:46:19 +0000 (13:46 -0800)]
am
1ee2394e: am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:43:36 +0000 (13:43 -0800)]
am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:39:19 +0000 (13:39 -0800)]
Merge "Changing connect and response timeout."
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:05:47 +0000 (11:05 -0800)]
am
005dd44b: am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:03:11 +0000 (11:03 -0800)]
am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 18:57:04 +0000 (10:57 -0800)]
Merge "NumberPicker: Set formatter local value to US."
Jeff Hamilton [Mon, 6 Dec 2010 04:03:59 +0000 (20:03 -0800)]
am
c1576ad6: Update the docs to clarify the ordering constraints.
* commit '
c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
Update the docs to clarify the ordering constraints.
Nick Pelly [Mon, 6 Dec 2010 02:13:10 +0000 (18:13 -0800)]
am
3d524e56: Merge gingerbread-nfc into gingerbread
* commit '
3d524e562606e7994ede3429b37937f40f94cd41':
First implementation of MifareUltralight
Nick Pelly [Mon, 6 Dec 2010 02:08:16 +0000 (18:08 -0800)]
Merge gingerbread-nfc into gingerbread
Nick Pelly [Sun, 5 Dec 2010 22:49:00 +0000 (14:49 -0800)]
am
d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
* commit '
d8c323321c28a0a5ff70c6e0694aa822edca4005':
Fixed technology name typo's.
Implement historical bytes / attrib on IsoDep
Provide system code and manufacturer code for Felica tech.
Fixed NfcAdapter init and getTechnology().
Secure Element access implementation
Rough first pass at the NFC technology API.
Revert "Merge "Remove the My Tag feature." into gingerbread"
Nick Pelly [Sun, 5 Dec 2010 22:46:29 +0000 (14:46 -0800)]
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
Nick Pelly [Sun, 5 Dec 2010 22:42:45 +0000 (14:42 -0800)]
Merge branch gingerbread-nfc into gingerbread.
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
Irfan Sheriff [Sun, 5 Dec 2010 07:45:18 +0000 (23:45 -0800)]
am
bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit '
bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
DO NOT MERGE Avoid nullifying dhcp target
Irfan Sheriff [Sat, 4 Dec 2010 01:58:17 +0000 (17:58 -0800)]
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
Mathias Agopian [Tue, 2 Nov 2010 06:32:18 +0000 (23:32 -0700)]
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
This is a poor's man precursor to the h/w composer HAL.
Basically we detect when a window is full screen and in
that case we bypass surfaceflinger's composition step, which
yields to much improved performance.
Change-Id: Ie03796ae81a1c951949b771c9323044b980cb347
Mathias Agopian [Wed, 3 Nov 2010 03:57:14 +0000 (20:57 -0700)]
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
This field indicate how the content of the buffer
needs to be transformed.
Change-Id: Ide3e980a90599e931406135693231276626adbbb
Mathias Agopian [Fri, 3 Dec 2010 05:32:29 +0000 (21:32 -0800)]
[
3171580] Fix two typos related to fixed-size buffers
mFixedSize was never set, this bug was introduced during some "cleanup", in
practice this could cause some issues when a fixed-size buffer was used and
the window was resized.
Layer::drawForSreenShot() had a typo that had no effect.
mFixedSize was used to determine if filtering was needed, which was a bit too
conservative and created a dependency between filtering and "fixed size" states
which should exist.
Now we enable filtering based on the size of the buffer vs. the size of the layer.
Change-Id: I32044e91b0c944c1b137efdceb3f01dfaa78119d
Mathias Agopian [Sat, 4 Dec 2010 01:33:09 +0000 (17:33 -0800)]
[
3171580] don't automatically log GraphicBuffer allocation failures
some of these failures are not fatal and even expected in some cases
so they should not emit a dump in the log in those cases.
Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
Mathias Agopian [Wed, 24 Nov 2010 23:59:35 +0000 (15:59 -0800)]
[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL
(there are multiple bugs this should fix)
we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.
this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.
Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
Hung-ying Tyan [Fri, 3 Dec 2010 01:56:40 +0000 (17:56 -0800)]
am
e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
* commit '
e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
Set AudioGroup mode according to audio settings
Hung-ying Tyan [Fri, 3 Dec 2010 01:50:33 +0000 (17:50 -0800)]
Merge "Set AudioGroup mode according to audio settings" into gingerbread
Jean-Baptiste Queru [Thu, 2 Dec 2010 23:21:35 +0000 (15:21 -0800)]
am
4a88013a: resolved conflicts for merge of
bf1439c5 to stage-korg-master
* commit '
4a88013a4a06a9ea80e8419f94694936e6b013f0':
Preserve flags field of event passed to injectKeyEvent()
Jean-Baptiste Queru [Thu, 2 Dec 2010 23:16:53 +0000 (15:16 -0800)]
resolved conflicts for merge of
bf1439c5 to stage-korg-master
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
Jean-Baptiste Queru [Thu, 2 Dec 2010 22:56:13 +0000 (14:56 -0800)]
Merge "Preserve flags field of event passed to injectKeyEvent()"
Xia Wang [Thu, 2 Dec 2010 21:44:54 +0000 (13:44 -0800)]
am
3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
* commit '
3591bebd5957a8547fc54659179a19440636e7f9':
Restore Wi-Fi configuration after the test. DO NOT MERGE
Xia Wang [Thu, 2 Dec 2010 21:40:23 +0000 (13:40 -0800)]
Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
James Dong [Thu, 2 Dec 2010 18:21:06 +0000 (10:21 -0800)]
am
d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread
* commit '
d4c5478a8664f64ff66db9ae25250afac78b7a74':
Be conservative in estimating the file size limit.
James Dong [Thu, 2 Dec 2010 18:13:36 +0000 (10:13 -0800)]
Merge "Be conservative in estimating the file size limit." into gingerbread
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:59:52 +0000 (07:59 -0800)]
am
40eade14: Merge from open-source master
* commit '
40eade14bb87d24903588de04449fdfe2e1795cb':
Fix crash by "adb shell pm list permissions -f|-s"
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:59:49 +0000 (07:59 -0800)]
am
077bc4ac: Merge from open-source master
* commit '
077bc4ac019ad33abd613448e11d3ad501218991':
Fix HTTP redirect missing statuscode 303 and 307
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:55:02 +0000 (07:55 -0800)]
Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:54:49 +0000 (07:54 -0800)]
Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
Jeff Hamilton [Thu, 2 Dec 2010 15:41:16 +0000 (09:41 -0600)]
Merge remote branch 'ohd/gingerbread' into merge
Eric Laurent [Thu, 2 Dec 2010 00:04:09 +0000 (16:04 -0800)]
am
78d81851: Merge "Fix issue
2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit '
78d81851a8ef6691541215afb19e5bc690a4c3c0':
Fix issue
2641884: Bluetooth volume is dependent on in call volume.
Eric Laurent [Wed, 1 Dec 2010 23:59:31 +0000 (15:59 -0800)]
Merge "Fix issue
2641884: Bluetooth volume is dependent on in call volume." into gingerbread
Kenny Root [Wed, 1 Dec 2010 22:20:49 +0000 (14:20 -0800)]
am
938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '
938d097263416ad416ee995e62dab559ea50bf0d':
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Kenny Root [Wed, 1 Dec 2010 22:18:23 +0000 (14:18 -0800)]
Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
Scott Main [Wed, 1 Dec 2010 21:59:08 +0000 (13:59 -0800)]
am
83df6ead: am
a45d6937: docs: dashboard update
* commit '
83df6ead8dfd2037e4681793d439fffa5afda9fc':
docs: dashboard update
Irfan Sheriff [Wed, 1 Dec 2010 21:59:04 +0000 (13:59 -0800)]
am
f36bde82: DO NOT MERGE Dont let supplicant stay in DORMANT state
* commit '
f36bde828c0e427c0dbbe543b2465114c9aff45c':
DO NOT MERGE Dont let supplicant stay in DORMANT state
Scott Main [Wed, 1 Dec 2010 20:59:42 +0000 (12:59 -0800)]
am
a45d6937: docs: dashboard update
* commit '
a45d693757c14c2d97a81f1fd8faa3ba38b53021':
docs: dashboard update
Eric Laurent [Wed, 1 Dec 2010 19:28:54 +0000 (11:28 -0800)]
am
e23212bc: Merge "Fix issue
3142808." into gingerbread
* commit '
e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
Fix issue
3142808.
Eric Laurent [Wed, 1 Dec 2010 19:26:37 +0000 (11:26 -0800)]
Merge "Fix issue
3142808." into gingerbread
John Wang [Wed, 1 Dec 2010 19:10:42 +0000 (11:10 -0800)]
am
4567847d: Add "canDial" check.
* commit '
4567847d461afac08a80518637a0e48eff3c5247':
Add "canDial" check.
Irfan Sheriff [Wed, 1 Dec 2010 18:40:05 +0000 (10:40 -0800)]
resolved conflicts for merge of
52556689 to gingerbread-plus-aosp
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
Irfan Sheriff [Wed, 1 Dec 2010 18:17:56 +0000 (10:17 -0800)]
Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread
Irfan Sheriff [Wed, 1 Dec 2010 17:53:17 +0000 (09:53 -0800)]
am
af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
* commit '
af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
Irfan Sheriff [Wed, 1 Dec 2010 17:51:27 +0000 (09:51 -0800)]
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread