OSDN Git Service
Robert Greenwalt [Mon, 25 Jul 2011 21:05:23 +0000 (14:05 -0700)]
Merge "Fix build." into honeycomb-plus-aosp
Robert Greenwalt [Mon, 25 Jul 2011 20:51:18 +0000 (13:51 -0700)]
Fix build.
Add NetworkUtils function missed in manual merge.
Change-Id: Ifce8f2988bb581ddc9b971b8af07a32f46c91e14
Dianne Hackborn [Mon, 25 Jul 2011 19:21:32 +0000 (12:21 -0700)]
am
20bf46af: am
b0878223: am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
20bf46af14130314ae1aeb1e5482c38556c8f0f8':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Mon, 25 Jul 2011 19:21:29 +0000 (12:21 -0700)]
am
9ce1ecdf: am
1a2fcea1: am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
9ce1ecdfde98c7b5b5ec346b883df0a50d9722e1':
frameworks/base: unlink death notifications of Vibrate requests
Xavier Ducrohet [Mon, 25 Jul 2011 19:21:17 +0000 (12:21 -0700)]
am
55775e5f: am
e70b2b8f: am
9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '
55775e5f34af8d7c22ab3212c253b3a7d34a6f8a':
Layoutlib_create flag -p: don't change all accesses to public.
Kenny Root [Mon, 25 Jul 2011 19:21:06 +0000 (12:21 -0700)]
am
e612c881: am
4f3a8db6: am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
e612c881ecf74770098aa9c07d4f0611ac982038':
Continue idmap generation even if name lookup fails.
Robert Greenwalt [Mon, 25 Jul 2011 19:08:19 +0000 (12:08 -0700)]
resolved conflicts for merge of
26ecc31f to honeycomb-plus-aosp
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
Wink Saville [Sun, 24 Jul 2011 16:13:26 +0000 (09:13 -0700)]
am
deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
* commit '
deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
Configure RAT dependent retry pattern in GSM DCT.
Kazuhiro Ondo [Sun, 24 Jul 2011 16:11:42 +0000 (09:11 -0700)]
am
4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '
4281817f6b624cb51926eb24fa78c68cd9431dce':
Allow suggestedRetryTime to indicate no retry is needed.
Wink Saville [Sun, 24 Jul 2011 16:11:28 +0000 (09:11 -0700)]
Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
Kazuhiro Ondo [Sun, 24 Jul 2011 15:08:38 +0000 (08:08 -0700)]
Allow suggestedRetryTime to indicate no retry is needed.
If suggestedRetryTime is 0x7fffffff then no retry is needed
and the framework should not initiate a retry.
Bug:
4949208
Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
Kazuhiro Ondo [Fri, 22 Jul 2011 01:13:52 +0000 (20:13 -0500)]
Configure RAT dependent retry pattern in GSM DCT.
In case GSM DCT is used with EHRPD, retry pattern should follow
the ones for CDMA.
Bug:
5058426
Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
Svetoslav Ganov [Sat, 23 Jul 2011 00:07:28 +0000 (17:07 -0700)]
am
d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
* commit '
d1b4c10fedc04384f40ba7fc30115a1380ce014f':
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
Svetoslav Ganov [Sat, 23 Jul 2011 00:05:26 +0000 (17:05 -0700)]
Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
Robert Greenwalt [Fri, 22 Jul 2011 20:15:56 +0000 (13:15 -0700)]
am
ad55d351: Add better routes for secondary DNS
* commit '
ad55d35114237071133eb28ded93a014185d4e35':
Add better routes for secondary DNS
Robert Greenwalt [Fri, 22 Jul 2011 18:55:33 +0000 (11:55 -0700)]
Add better routes for secondary DNS
We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on
some devices (multi-homed stingray) this is a problem. Add gateway-ed hostroutes
instead so the BP can do it's nonstandard "magical" demultiplexing.
bug:
5011392
Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
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"
Svetoslav Ganov [Mon, 27 Jun 2011 19:38:29 +0000 (12:38 -0700)]
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
CHERRY PICK FROM MASTER
1. AccessibilityInjectorTest changes the key bindings and when done
restores the defatult ones. The restoreation was not working.
bug:
4905620
Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
Kazuhiro Ondo [Fri, 22 Jul 2011 01:15:26 +0000 (18:15 -0700)]
am
1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit '
1c82f56f2453a8a7c83090017ab2427a74829b9a':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
Kazuhiro Ondo [Wed, 20 Jul 2011 23:55:47 +0000 (18:55 -0500)]
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
Fix to resolve conflicting ERI and CSIM SPN. CSIM SPN should be
only used when camping SID/NID is listed in CDMAHOME record.
Bug:
5057486
Change-Id: I6c5961bb53cc6257237fa5a93a0acd067b12d009
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:55:21 +0000 (18:55 -0700)]
am
3a2d1c23: am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
Fix to compile for windows
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 [Thu, 21 Jul 2011 00:45:11 +0000 (17:45 -0700)]
resolved conflicts for merge of
ea9e6d24 to honeycomb-plus-aosp
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
Xavier Ducrohet [Wed, 20 Jul 2011 23:31:25 +0000 (16:31 -0700)]
resolved conflicts for merge of
2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
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
Wink Saville [Tue, 19 Jul 2011 19:39:42 +0000 (12:39 -0700)]
am
f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit '
f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
Fix FeatureUser leak in ConnectivityService
Kazuhiro Ondo [Tue, 19 Jul 2011 19:39:39 +0000 (12:39 -0700)]
am
bf361b59: Return IMEI SV if CDMA-LTE mode is used
* commit '
bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
Return IMEI SV if CDMA-LTE mode is used
Wink Saville [Tue, 19 Jul 2011 19:37:18 +0000 (12:37 -0700)]
Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
Kazuhiro Ondo [Tue, 19 Jul 2011 01:01:04 +0000 (20:01 -0500)]
Return IMEI SV if CDMA-LTE mode is used
IMEI and IMEI SV should be available in CDMA-LTE hybrid system.
IMS SV value is not yet returned.
Bug:
5042972
Change-Id: I733825e95f802605e06887951e226d26baea8ff2
Kazuhiro Ondo [Tue, 19 Jul 2011 16:23:37 +0000 (11:23 -0500)]
Fix FeatureUser leak in ConnectivityService
In case infinite restoral timer is used for a network feature,
FeatureUser could be keep added but never released if a user
is keep calling "startUsingNetworkFeature".
This patch will add duplication check when adding a FeatureUser
into the list in case infinite restoral timer is used.
Bug:
5043513
Change-Id: I47e7076e217f201454fae33ce596ecdc63cf7908
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:28 +0000 (10:18 -0700)]
am
ba6c98db: am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:25 +0000 (10:18 -0700)]
am
d5431ed5: am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
d5431ed5505a42e5e33c8bf7cc2ff72792979be9':
Copy once-created R.java into library projects
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"
Wink Saville [Tue, 19 Jul 2011 01:39:41 +0000 (18:39 -0700)]
am
cd4636ec: Add LteOnCdmaDevice system property.
* commit '
cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
Add LteOnCdmaDevice system property.
Conley Owens [Mon, 18 Jul 2011 23:55:33 +0000 (16:55 -0700)]
am
a4aef41a: am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
a4aef41a74a69b0296b88361ffb33d0470a26362':
stagefright aacenc: Mark codeWord as UWord16
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:44:03 +0000 (15:44 -0700)]
am
2acddc54: am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:44:01 +0000 (15:44 -0700)]
am
31140598: am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
31140598866c668047fc6dede7944e146aa21a0a':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:58 +0000 (15:43 -0700)]
am
29fd8cdb: am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:54 +0000 (15:43 -0700)]
am
691257b1: am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
691257b1812ffd8172b01c17b9ba23a48eb76594':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
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:47:50 +0000 (12:47 -0700)]
am
45ddd425: am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
45ddd42544167494cee7213ecddcb6f8057c86c0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
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"
Wink Saville [Mon, 18 Jul 2011 18:32:55 +0000 (11:32 -0700)]
Add LteOnCdmaDevice system property.
Provide a system property which may be
optionally set at build time.
Change-Id: I253ff0df7c8f8c5627c775fb0cff2cb831157eed
Nick Pelly [Fri, 15 Jul 2011 17:47:10 +0000 (10:47 -0700)]
am
1bce9e25: am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
1bce9e25b6979780d849096059ef73507bdda250':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Robert Greenwalt [Fri, 15 Jul 2011 17:20:48 +0000 (10:20 -0700)]
Robert Greenwalt [Fri, 15 Jul 2011 16:55:48 +0000 (09:55 -0700)]
resolved conflicts for merge of
0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
Robert Greenwalt [Fri, 15 Jul 2011 16:45:08 +0000 (09:45 -0700)]
Small fix to
5008973 fix.
Removed redundent log.
Cleaned some logic.
Will try to modify route even if recursive operation had an error.
bug:
5008973
Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da
Robert Greenwalt [Thu, 14 Jul 2011 21:28:05 +0000 (14:28 -0700)]
Apply the dns and route diff which we get a change
bug:
5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
John Wang [Thu, 14 Jul 2011 21:00:58 +0000 (14:00 -0700)]
am
54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '
54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
Show SIM blocked after 10 time puk wrong entries.
John Wang [Thu, 14 Jul 2011 20:59:10 +0000 (13:59 -0700)]
Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
John Wang [Fri, 8 Jul 2011 19:31:08 +0000 (12:31 -0700)]
Show SIM blocked after 10 time puk wrong entries.
After user enters 10 time wrong puk in puk unlock screen,
device need show the SIM permanently disabled message
is in lock screen.
bug:
4905509
Change-Id: I06242834972b3f403cfe99a2edd8bae47d7ed474
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)
Wink Saville [Wed, 13 Jul 2011 21:19:12 +0000 (14:19 -0700)]
am
6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '
6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
OSDN Git Service
