OSDN Git Service
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:19:05 +0000 (17:19 -0700)]
am
98c531dc: am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
98c531dca9e52af280ca002658bbe38775b3f6ae':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:15:24 +0000 (17:15 -0700)]
am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
9b0c6beed2cd5463655712ad80ed160c08611ff8':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:02:48 +0000 (17:02 -0700)]
Merge "Fix a compiling error when trying to use setBufferCount"
Teng-Hui Zhu [Tue, 2 Aug 2011 23:26:41 +0000 (16:26 -0700)]
Fix a compiling error when trying to use setBufferCount
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
Conley Owens [Tue, 2 Aug 2011 20:24:00 +0000 (13:24 -0700)]
am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
e1d271546767a8e2213aabba92506af9e97020b4':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:21:12 +0000 (13:21 -0700)]
am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
f87743e7bdfd10b9a1719036a6320a32df078879':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:08:14 +0000 (13:08 -0700)]
Merge "Prevent NullPointerException cases while using SipService."
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:59:02 +0000 (13:59 -0700)]
am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:55:45 +0000 (13:55 -0700)]
am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
5e57c2cf83ef62e9887592b46a4c3352662fb988':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:43:07 +0000 (13:43 -0700)]
Merge "Stagefright: Return error if codec takes too long to return a buffer."
Eric Fischer [Mon, 1 Aug 2011 18:17:17 +0000 (11:17 -0700)]
am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:15:58 +0000 (11:15 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Masahiko Endo [Thu, 28 Jul 2011 12:51:43 +0000 (21:51 +0900)]
Prevent NullPointerException cases while using SipService.
Some SipService methods may return null, in such cases like no Wi-Fi
connection. Added minimum check to prevent NullPointerExceptions.
Change-Id: Ia7fae57ee893f2564cbfdedb6dc614938ab60ff7
Signed-off-by: Masahiko Endo <masahiko.endo@gmail.com>
Derek Sollenberger [Fri, 29 Jul 2011 16:53:09 +0000 (09:53 -0700)]
am
b7ed8471: am
01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '
b7ed8471f1b96aff901149cf9ac29e4b32672f93':
Adding an optional param to the SurfaceTexture constructor.
Derek Sollenberger [Fri, 29 Jul 2011 16:50:11 +0000 (09:50 -0700)]
am
01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '
01caec8c4165a6cce2f276f8016b9eadab966944':
Adding an optional param to the SurfaceTexture constructor.
Derek Sollenberger [Fri, 29 Jul 2011 16:43:13 +0000 (09:43 -0700)]
Merge "Adding an optional param to the SurfaceTexture constructor."
Derek Sollenberger [Fri, 29 Jul 2011 15:04:51 +0000 (11:04 -0400)]
Adding an optional param to the SurfaceTexture constructor.
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
Mike Lockwood [Thu, 28 Jul 2011 21:02:14 +0000 (14:02 -0700)]
am
5a27a754: am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
5a27a7543edbd09a56e36d04adb4cfab922e6346':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 21:00:27 +0000 (14:00 -0700)]
am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 20:52:55 +0000 (13:52 -0700)]
Merge "gps: Adding ip address for AGps"
Stephen Li [Wed, 2 Mar 2011 04:56:00 +0000 (20:56 -0800)]
gps: Adding ip address for AGps
Change-Id: Ic590187d159853de2f1bd2912e159f0a00d8fb10
Mike Lockwood [Thu, 28 Jul 2011 20:25:34 +0000 (13:25 -0700)]
am
7083ed44: am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:23:01 +0000 (13:23 -0700)]
am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
0ff79e88e2d90f80d0346e0485abe773ca85c44d':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:13:35 +0000 (13:13 -0700)]
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
Xavier Ducrohet [Thu, 28 Jul 2011 01:38:50 +0000 (18:38 -0700)]
am
cd01ad7c: am
20339b24: Merge "Remove Debug Code"
* commit '
cd01ad7cc7813e3067826945c2a472602f1d3509':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:36:17 +0000 (18:36 -0700)]
am
20339b24: Merge "Remove Debug Code"
* commit '
20339b24394be06c5bfe5157a4b35adc48f665eb':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:26:01 +0000 (18:26 -0700)]
Merge "Remove Debug Code"
Josiah Gaskin [Thu, 28 Jul 2011 00:45:32 +0000 (17:45 -0700)]
Remove Debug Code
This change removes debugging code from FileFinder.
This code was considered harmful because it uses the std::cout
from <iostream>.
Change-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056
Xavier Ducrohet [Wed, 27 Jul 2011 21:01:23 +0000 (14:01 -0700)]
am
4d21c773: am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
4d21c7732c978a593dfa78f8da1fed7511b38e95':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 20:59:57 +0000 (13:59 -0700)]
am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
4d1fa60bfe660fd0fc6671116da597c0027cbb16':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 20:45:05 +0000 (13:45 -0700)]
Merge "DO NOT MERGE. may fix build on some version of gcc"
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
Dianne Hackborn [Fri, 22 Jul 2011 05:37:13 +0000 (22:37 -0700)]
am
b0878223: am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
b0878223db87700cdc988a6d9197ca4e3c4772db':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Fri, 22 Jul 2011 05:35:32 +0000 (22:35 -0700)]
am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
6800a80199477c90fc64af7211a177de06478a02':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Fri, 22 Jul 2011 05:26:20 +0000 (22:26 -0700)]
am
1a2fcea1: am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
frameworks/base: unlink death notifications of Vibrate requests
Dianne Hackborn [Fri, 22 Jul 2011 05:23:46 +0000 (22:23 -0700)]
am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
2f4698fda46a3d2a6e78019588d77bae1cfa7193':
frameworks/base: unlink death notifications of Vibrate requests
Dianne Hackborn [Fri, 22 Jul 2011 05:21:19 +0000 (22:21 -0700)]
Merge "frameworks/base: Cap the number of toasts that a package can post."
Dianne Hackborn [Fri, 22 Jul 2011 05:18:47 +0000 (22:18 -0700)]
Merge "frameworks/base: unlink death notifications of Vibrate requests"
Xavier Ducrohet [Thu, 21 Jul 2011 23:25:50 +0000 (16:25 -0700)]
am
e70b2b8f: am
9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '
e70b2b8fe0c265171f3a367a66c99b36c62567c7':
Layoutlib_create flag -p: don't change all accesses to public.
Xavier Ducrohet [Thu, 21 Jul 2011 23:23:18 +0000 (16:23 -0700)]
am
9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '
9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
Layoutlib_create flag -p: don't change all accesses to public.
Xavier Ducrohet [Thu, 21 Jul 2011 23:17:03 +0000 (16:17 -0700)]
Merge "Layoutlib_create flag -p: don't change all accesses to public."
Kenny Root [Thu, 21 Jul 2011 20:11:01 +0000 (13:11 -0700)]
am
4f3a8db6: am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
4f3a8db64d75cd3e88213d3b105dc50fc5bd6262':
Continue idmap generation even if name lookup fails.
Kenny Root [Thu, 21 Jul 2011 20:09:05 +0000 (13:09 -0700)]
am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
3cf039876177b5b314b635bb12a1dae1b42f4605':
Continue idmap generation even if name lookup fails.
Kenny Root [Thu, 21 Jul 2011 20:05:03 +0000 (13:05 -0700)]
Merge "Continue idmap generation even if name lookup fails."
Robert Greenwalt [Thu, 21 Jul 2011 18:29:05 +0000 (11:29 -0700)]
am
594745ab: am
b9f87f19: Merge "First pass tying into per-interface DNS cache"
* commit '
594745abefe53abe7f577bbb3cc176d52ee00ba1':
First pass tying into per-interface DNS cache
Robert Greenwalt [Thu, 21 Jul 2011 18:28:01 +0000 (11:28 -0700)]
am
b9f87f19: Merge "First pass tying into per-interface DNS cache"
* commit '
b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
First pass tying into per-interface DNS cache
Robert Greenwalt [Thu, 21 Jul 2011 18:16:12 +0000 (11:16 -0700)]
Merge "First pass tying into per-interface DNS cache"
Xavier Ducrohet [Thu, 21 Jul 2011 01:53:08 +0000 (18:53 -0700)]
am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:49:46 +0000 (18:49 -0700)]
am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:35:35 +0000 (18:35 -0700)]
Merge "Fix to compile for windows"
Josiah Gaskin [Thu, 21 Jul 2011 00:33:08 +0000 (17:33 -0700)]
Fix to compile for windows
This change includes a workaround for dirent.h on windows not
including d_type.
Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
Xavier Ducrohet [Wed, 20 Jul 2011 23:02:33 +0000 (16:02 -0700)]
am
b582af31: am
0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit '
b582af31c74a58922120fdb747c1a3b867d95e90':
Added Caching for PreProcessed PNGs
Xavier Ducrohet [Wed, 20 Jul 2011 23:00:44 +0000 (16:00 -0700)]
am
0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit '
0bc12a0b13719976aff95a801d88e48c64510d11':
Added Caching for PreProcessed PNGs
Xavier Ducrohet [Wed, 20 Jul 2011 22:55:32 +0000 (15:55 -0700)]
Merge "Added Caching for PreProcessed PNGs"
Xavier Ducrohet [Wed, 20 Jul 2011 22:27:39 +0000 (15:27 -0700)]
am
30824495: am
1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '
3082449508a8c574d0476fdb988f98d9554637ae':
Add generation of dependency file for .ap_ package
Xavier Ducrohet [Wed, 20 Jul 2011 22:23:55 +0000 (15:23 -0700)]
am
1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '
1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
Add generation of dependency file for .ap_ package
Josiah Gaskin [Tue, 7 Jun 2011 00:00:35 +0000 (17:00 -0700)]
Added Caching for PreProcessed PNGs
Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.
Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
Xavier Ducrohet [Wed, 20 Jul 2011 22:08:23 +0000 (15:08 -0700)]
Merge "Add generation of dependency file for .ap_ package"
Robert Greenwalt [Fri, 20 May 2011 21:35:50 +0000 (14:35 -0700)]
First pass tying into per-interface DNS cache
Change-Id: Iacce225d392786e37fa2dbf9647045fca0b70e64
Raphael Moll [Wed, 20 Jul 2011 05:36:13 +0000 (22:36 -0700)]
Layoutlib_create flag -p: don't change all accesses to public.
Change-Id: Icb1709ed0cb275a5a51ca34030695a5e94091499
Xavier Ducrohet [Tue, 19 Jul 2011 17:15:11 +0000 (10:15 -0700)]
am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
82943ecfe2c4266cf3db50326240825fefcaa38f':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:15:09 +0000 (10:15 -0700)]
am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
2e659ae59c17a0c0584d35b8c400a294c9d49e12':
Copy once-created R.java into library projects
Xavier Ducrohet [Tue, 19 Jul 2011 17:10:17 +0000 (10:10 -0700)]
am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
d40c93f61ca5b3f2351b8db716f67b58f1625e85':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:10:15 +0000 (10:10 -0700)]
am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
42755155d6e8ddc3201b08def2bf262a64fa25f2':
Copy once-created R.java into library projects
Xavier Ducrohet [Tue, 19 Jul 2011 17:03:16 +0000 (10:03 -0700)]
Merge "Add dependency generation to Aapt for R.java"
Xavier Ducrohet [Tue, 19 Jul 2011 17:03:05 +0000 (10:03 -0700)]
Merge "Copy once-created R.java into library projects"
Conley Owens [Mon, 18 Jul 2011 23:53:41 +0000 (16:53 -0700)]
am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
a74774fd9146aa22801487d3652dc18e9e328b8e':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:52:26 +0000 (16:52 -0700)]
am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:49:43 +0000 (16:49 -0700)]
Merge "stagefright aacenc: Mark codeWord as UWord16"
Josiah Gaskin [Mon, 27 Jun 2011 23:26:02 +0000 (16:26 -0700)]
Add generation of dependency file for .ap_ package
Make Aapt generate a dependency file in the same directory as the
output ap_ file if the --generate-dependencies flag is set.
This dependency file can then be read by the ant exec loop task
to see whether to repackage resources.
Change-Id: I763679414daf76369700aa599c26dcf78d4de099
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:31 +0000 (15:41 -0700)]
am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
89bac1820f3788d655ae293ec9a65c18226e09ee':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:29 +0000 (15:41 -0700)]
am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
16db83c26442f5e25b6aad77a37b612fa0be9862':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:26 +0000 (15:41 -0700)]
am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
80ef1745d00c235b117e389e56e58210cf88e5c8':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:24 +0000 (15:41 -0700)]
am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
68e37dacc065eebb971d443722b7a8413ff403d6':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:30 +0000 (15:38 -0700)]
am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:27 +0000 (15:38 -0700)]
am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:25 +0000 (15:38 -0700)]
am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:22 +0000 (15:38 -0700)]
am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:41 +0000 (15:23 -0700)]
Merge "stagefright: Include stdlib.h for malloc/free"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:31 +0000 (15:23 -0700)]
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:20 +0000 (15:23 -0700)]
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:09 +0000 (15:23 -0700)]
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
Conley Owens [Mon, 18 Jul 2011 19:44:57 +0000 (12:44 -0700)]
am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
3edba93fd9bff8e2b22486271e6e816e3b233ae9':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:42:42 +0000 (12:42 -0700)]
am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:37:16 +0000 (12:37 -0700)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Nick Pelly [Thu, 14 Jul 2011 05:38:44 +0000 (22:38 -0700)]
am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
01588acaf87cfe9916239b7b26cc6810e0097138':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Jaikumar Ganesh [Wed, 13 Jul 2011 17:25:27 +0000 (10:25 -0700)]
am
9ff89495: am
53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '
9ff89495a4890191a0bc5dfddf28f23f79f23698':
Bluetooth: correcting return value from cancelDiscovery
Jaikumar Ganesh [Wed, 13 Jul 2011 17:22:40 +0000 (10:22 -0700)]
am
53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '
53cf7858c3fd36082302efdc4d848925bcc0001e':
Bluetooth: correcting return value from cancelDiscovery
Jaikumar Ganesh [Wed, 13 Jul 2011 17:04:19 +0000 (10:04 -0700)]
Merge "Bluetooth: correcting return value from cancelDiscovery"
David 'Digit' Turner [Mon, 11 Jul 2011 22:57:09 +0000 (00:57 +0200)]
resolved conflicts for merge of
7816eded to gingerbread-plus-aosp
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
Nick Pelly [Mon, 11 Jul 2011 18:07:22 +0000 (11:07 -0700)]
Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
Robert Tsai [Sun, 10 Jul 2011 06:57:22 +0000 (23:57 -0700)]
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Change-Id: I85fcbc5e79549835dac255ce614bd5d65d39fc25
David 'Digit' Turner [Fri, 8 Jul 2011 16:19:01 +0000 (18:19 +0200)]
merge intel x86 patches into gingerbread branch
David 'Digit' Turner [Thu, 16 Jun 2011 15:40:23 +0000 (17:40 +0200)]
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
This patch fixes a really annoying bug that prevented the emulator
from properly mounting the SD Card.
The issue was that mOutputStream was not initialized when the onDaemonConnected
callbacks are called, just after the daemon's socket connection is established.
In one specific case (MountService a.k.a. VoldConnector), the corresponding
callback function immediately tried to perform a doCommandList() call on the
connector object. The request failed because mOutputStream was still defined
as null when it happened.
By moving the initialization of the variable just before the callback is
invoked, we ensure that things work properly.
Change-Id: I46726a50ef69eaafe70081ff4eda1244b744beba
Bruce Beare [Fri, 25 Jun 2010 16:08:12 +0000 (09:08 -0700)]
Fix missing NL
Orig-Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Robert Greenwalt [Wed, 6 Jul 2011 14:42:19 +0000 (07:42 -0700)]
am
2b62c4fb: am
38bb0123: Merge "Added methods to support dns cache per interface"
* commit '
2b62c4fbfeb7df0988bf216c50cd4a24f05add9f':
Added methods to support dns cache per interface
Robert Greenwalt [Wed, 6 Jul 2011 14:35:02 +0000 (07:35 -0700)]
am
38bb0123: Merge "Added methods to support dns cache per interface"
* commit '
38bb0123b8b9857c3119fd359739daf872f619d6':
Added methods to support dns cache per interface
Robert Greenwalt [Fri, 1 Jul 2011 16:26:50 +0000 (09:26 -0700)]
Merge "Added methods to support dns cache per interface"
Conley Owens [Thu, 30 Jun 2011 15:22:10 +0000 (08:22 -0700)]
am
9f2cbf14: am
e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '
9f2cbf14f8d79e6ed48ff9d76f6aaede45185418':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
Conley Owens [Thu, 30 Jun 2011 15:19:00 +0000 (08:19 -0700)]
am
e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '
e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
OSDN Git Service
