OSDN Git Service
Suchi Amalapurapu [Wed, 19 Aug 2009 00:31:54 +0000 (17:31 -0700)]
am
d50066f8: invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService
Merge commit '
d50066f8d2ab82c2c8ff305c86cc9b39eaca3c28' into eclair
* commit '
d50066f8d2ab82c2c8ff305c86cc9b39eaca3c28':
invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService
Android (Google) Code Review [Wed, 19 Aug 2009 00:22:02 +0000 (17:22 -0700)]
Merge change 21831 into eclair
* changes:
Add reflections to the water
Android (Google) Code Review [Wed, 19 Aug 2009 00:15:04 +0000 (17:15 -0700)]
Merge change 21825 into eclair
* changes:
Implement OOB destroy method that can be called from the java finalizer removing the need to explicitly destroy objects.
Android (Google) Code Review [Tue, 18 Aug 2009 23:57:02 +0000 (16:57 -0700)]
Merge change 21764 into eclair
* changes:
Add aapt extensions to dump badging to print more info about activities, receivers and services Fix issue with checking end tags. Earlier some boolean variables were being set once a new tag is detected at the same level which causes some incorrect values to be overwritten. we should be doing this when we detect the end tag.
Android (Google) Code Review [Tue, 18 Aug 2009 23:54:59 +0000 (16:54 -0700)]
Merge change 21811 into eclair
* changes:
More wallpaper fixes: scroll position, visibility, leaking.
Android (Google) Code Review [Tue, 18 Aug 2009 22:51:36 +0000 (15:51 -0700)]
Merge change 21776 into eclair
* changes:
Cleanup of object destruction. No need to have a per-class destruction function. This was a legacy of the distant past when the classes did not have a common base.
Android (Google) Code Review [Tue, 18 Aug 2009 22:41:14 +0000 (15:41 -0700)]
Merge change 21790 into eclair
* changes:
Dormant ICON was not being displayed, fixes bug
2039239.
Android (Google) Code Review [Tue, 18 Aug 2009 21:15:38 +0000 (14:15 -0700)]
Merge change 21770 into eclair
* changes:
Fix issue #
2047139: Remove Service.setForeground()
Xavier Ducrohet [Tue, 18 Aug 2009 20:42:09 +0000 (13:42 -0700)]
am
ad4bc607: Merge change 21772 into donut
Merge commit '
ad4bc607bd236dd9b06df9cf89dc5e14541ff66c' into eclair
* commit '
ad4bc607bd236dd9b06df9cf89dc5e14541ff66c':
Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
Android (Google) Code Review [Tue, 18 Aug 2009 20:39:50 +0000 (13:39 -0700)]
Merge change 21772 into donut
* changes:
Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
Eric Fischer [Tue, 18 Aug 2009 20:11:32 +0000 (13:11 -0700)]
am
79dbf7c8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
79dbf7c8fc910957c9687b863eae97a768d6be60' into eclair
* commit '
79dbf7c8fc910957c9687b863eae97a768d6be60':
Import revised translations. DO NOT MERGE
Jack Palevich [Tue, 18 Aug 2009 20:11:08 +0000 (13:11 -0700)]
am
238f8fe6: Merge change 21652 into donut
Merge commit '
238f8fe645271a0ef891553e1c8c3c964c3c876d' into eclair
* commit '
238f8fe645271a0ef891553e1c8c3c964c3c876d':
Make ZoomButtonsController public.
Android Git Automerger [Tue, 18 Aug 2009 20:08:40 +0000 (13:08 -0700)]
resolved conflicts for merge of
6ba69734 to eclair, skipping preloaded-classes as pre Bob
Suchi Amalapurapu [Tue, 18 Aug 2009 20:00:32 +0000 (13:00 -0700)]
am
d9d25760: Remove dead locks in system process when installing packages
Merge commit '
d9d2576017fadcf47589b54e8ee198f48cc19352' into eclair
* commit '
d9d2576017fadcf47589b54e8ee198f48cc19352':
Remove dead locks in system process when installing packages
Android (Google) Code Review [Tue, 18 Aug 2009 19:52:29 +0000 (12:52 -0700)]
Merge change 21745 into eclair
* changes:
Refactored "stagefright" commandline app, split off JPEGSource.
Android (Google) Code Review [Tue, 18 Aug 2009 19:39:34 +0000 (12:39 -0700)]
Merge change 21748 into eclair
* changes:
Get At command count from Bluetooth headset.
Android (Google) Code Review [Tue, 18 Aug 2009 19:33:54 +0000 (12:33 -0700)]
Merge change 21716 into eclair
* changes:
Include the list of registered providers the package manager dumpsys output.
Android (Google) Code Review [Tue, 18 Aug 2009 19:12:27 +0000 (12:12 -0700)]
Merge change 21754 into eclair
* changes:
E911 call fix in ECM
Android (Google) Code Review [Tue, 18 Aug 2009 18:39:43 +0000 (11:39 -0700)]
Merge change 21750 into eclair
* changes:
Tweak the galaxy
Android (Google) Code Review [Tue, 18 Aug 2009 18:24:04 +0000 (11:24 -0700)]
Merge change 21728 into eclair
* changes:
removing old gears code and correcting simple method typo
Android (Google) Code Review [Tue, 18 Aug 2009 18:05:58 +0000 (11:05 -0700)]
Merge change 21727 into eclair
* changes:
Fix missing -lpthread in linux-sim build.
Xavier Ducrohet [Tue, 18 Aug 2009 18:01:19 +0000 (11:01 -0700)]
am
ace6a5cf: Merge change 21408 into donut
Merge commit '
ace6a5cfc0d14a909b4b95bdfe16609188125baf' into eclair
* commit '
ace6a5cfc0d14a909b4b95bdfe16609188125baf':
Improved drawing/matrix support in layoutlib
Jasperln [Tue, 18 Aug 2009 18:01:11 +0000 (11:01 -0700)]
am
f5e6a211: Merge change 21572 into donut
Merge commit '
f5e6a211b16e26104b6fb2d32ef4eabbf9fbc2d1' into eclair
* commit '
f5e6a211b16e26104b6fb2d32ef4eabbf9fbc2d1':
Add constants to adjust Vending input and output buffer sizes.
Eric Fischer [Tue, 18 Aug 2009 18:00:28 +0000 (11:00 -0700)]
am
093918a6: (-s ours) Merge change 21549 into donut
Merge commit '
093918a62818c6bb176921928d2ca7a22857ec9b' into eclair
* commit '
093918a62818c6bb176921928d2ca7a22857ec9b':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Tue, 18 Aug 2009 18:00:16 +0000 (11:00 -0700)]
am
c678a93a: Fix issue #
2056585: applications can put phone in inconsistent state wrt airplane mode
Merge commit '
c678a93a73c83e841032874bee9c202936da73c0' into eclair
* commit '
c678a93a73c83e841032874bee9c202936da73c0':
Fix issue #
2056585: applications can put phone in inconsistent state wrt airplane mode
Mike LeBeau [Tue, 18 Aug 2009 17:59:53 +0000 (10:59 -0700)]
am
cfa419b7: Correct comments for startSearch in Activity and SearchManager to explain Donut behavior correctly.
Merge commit '
cfa419b754332e12f8cd45244c2f3bee9d6a74bb' into eclair
* commit '
cfa419b754332e12f8cd45244c2f3bee9d6a74bb':
Correct comments for startSearch in Activity and SearchManager to explain
Jean-Michel Trivi [Tue, 18 Aug 2009 17:59:20 +0000 (10:59 -0700)]
am
d5884a9b: Merge change 21358 into donut
Merge commit '
d5884a9ba45e58294c09fd2747c87d761b9daee5' into eclair
* commit '
d5884a9ba45e58294c09fd2747c87d761b9daee5':
Unhide the broadcast intent that signals completion of the TTS language
Suchi Amalapurapu [Tue, 18 Aug 2009 17:59:08 +0000 (10:59 -0700)]
am
75c49842: Add maxSdkVersion information in dump badging option
Merge commit '
75c498426a17b47d445711bb9e36794b05876a56' into eclair
* commit '
75c498426a17b47d445711bb9e36794b05876a56':
Add maxSdkVersion information in dump badging option
Android (Google) Code Review [Tue, 18 Aug 2009 17:51:49 +0000 (10:51 -0700)]
Merge change 21468 into eclair
* changes:
Couple of fixes for viewport.
Android (Google) Code Review [Tue, 18 Aug 2009 17:29:43 +0000 (10:29 -0700)]
Merge change 21634 into eclair
* changes:
Add new calendar database columns; do not merge (cherry-picked 1fa64)
Android (Google) Code Review [Tue, 18 Aug 2009 16:59:40 +0000 (09:59 -0700)]
Merge change 21221 into eclair
* changes:
Modify svc power command so it pokes the wake lock when called. This will ensure screen is not asleep if stayon is requested.
Xavier Ducrohet [Tue, 18 Aug 2009 15:44:59 +0000 (08:44 -0700)]
am
c1c432f5: Merge change 21241 into donut
Merge commit '
c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839' into eclair
* commit '
c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839':
Layoutlib now uses the dimen status_bar_height instead of hard-coded value
Jean-Michel Trivi [Tue, 18 Aug 2009 15:44:51 +0000 (08:44 -0700)]
am
0950c5de: Merge change 21226 into donut
Merge commit '
0950c5de864d1ad83ed96efc5c2d1569b4d36188' into eclair
* commit '
0950c5de864d1ad83ed96efc5c2d1569b4d36188':
Fix bug
2046705 where the output of the speech synthesizer is too low.
Jean-Baptiste Queru [Tue, 18 Aug 2009 15:44:43 +0000 (08:44 -0700)]
am
c8ab08aa: Merge change 21124 into donut
Merge commit '
c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd' into eclair
* commit '
c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd':
Add license-related files
Scott Main [Tue, 18 Aug 2009 15:44:38 +0000 (08:44 -0700)]
Android (Google) Code Review [Tue, 18 Aug 2009 15:44:18 +0000 (08:44 -0700)]
Merge change 21648 into eclair
* changes:
Remove the hack to include Gears as it is gone now.
Android (Google) Code Review [Tue, 18 Aug 2009 14:20:06 +0000 (07:20 -0700)]
Merge change 21326 into eclair
* changes:
aapt now attempts to process all assets even if some are malformed.
Android (Google) Code Review [Tue, 18 Aug 2009 13:03:47 +0000 (06:03 -0700)]
Merge change 21601 into eclair
* changes:
BatteryService: Add support for new standard battery voltage and temperature attributes.
Android (Google) Code Review [Tue, 18 Aug 2009 07:27:16 +0000 (00:27 -0700)]
Merge change 21646 into eclair
* changes:
fix bug [
2021677] egl driver unloaded after eglTerminate() is called
Android (Google) Code Review [Tue, 18 Aug 2009 03:00:32 +0000 (20:00 -0700)]
Merge change 21660 into eclair
* changes:
Optimized Galaxy
Android (Google) Code Review [Tue, 18 Aug 2009 02:21:49 +0000 (19:21 -0700)]
Merge change 21655 into eclair
* changes:
resolved conflicts for merge of
696b912e to eclair
johnwang [Tue, 18 Aug 2009 02:03:52 +0000 (19:03 -0700)]
resolved conflicts for merge of
696b912e to eclair
modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
Android (Google) Code Review [Tue, 18 Aug 2009 01:40:38 +0000 (18:40 -0700)]
Merge change 21653 into eclair
* changes:
Remove global IO context and integrate it into the RS context.
Android (Google) Code Review [Tue, 18 Aug 2009 01:38:53 +0000 (18:38 -0700)]
Merge change 21652 into donut
* changes:
Make ZoomButtonsController public.
Android (Google) Code Review [Tue, 18 Aug 2009 01:18:44 +0000 (18:18 -0700)]
Merge change 21637 into eclair
* changes:
Fix
2058938. As zoom control is uesd in overview mode to switch to reading mode, we also want to hide it after double tap is done.
Mathias Agopian [Tue, 18 Aug 2009 01:07:06 +0000 (18:07 -0700)]
fix bug [
2021677] egl driver unloaded after eglTerminate() is called
refactored the code so that:
- EGL APIs that can be called before or after eglInitialize() will work by loading the drivers first
- make eglGetDisplay() a lot more efficient
- make sure that EGL drivers are loaded in a thread-safe way
- don't unload the drivers upon calling eglTerminate(), they're now never unloaded, since there is no safe way to do it (some thread could be running)
- updated our EGL version to 1.4
- return better error codes if errors happen during initialization
Android (Google) Code Review [Tue, 18 Aug 2009 00:58:05 +0000 (17:58 -0700)]
Merge change 21178 into donut
* changes:
Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
Android (Google) Code Review [Tue, 18 Aug 2009 00:24:47 +0000 (17:24 -0700)]
Merge change 21638 into eclair
* changes:
Don't use BoringLayout to display text that has paragraph-style markup.
Android (Google) Code Review [Mon, 17 Aug 2009 23:39:43 +0000 (16:39 -0700)]
Merge change 21576 into eclair
* changes:
Support for marshalling pointers / intptr_t in Parcel.
Android (Google) Code Review [Mon, 17 Aug 2009 22:48:01 +0000 (15:48 -0700)]
Merge change 21581 into eclair
* changes:
Fix CDMA to startup/shutdown based on apn en/disab
Android (Google) Code Review [Mon, 17 Aug 2009 22:38:14 +0000 (15:38 -0700)]
Merge change 21516 into eclair
* changes:
Update docs: readFromParcel() is not necessary to make a class support Parcelable.
Andreas Huber [Mon, 17 Aug 2009 20:33:27 +0000 (13:33 -0700)]
Support for marshalling pointers / intptr_t in Parcel.
Some refactoring to eliminate code duplication in Parcel implementation.
Android (Google) Code Review [Mon, 17 Aug 2009 22:25:23 +0000 (15:25 -0700)]
Merge change 21603 into eclair
* changes:
Fix infinite recursion.
Android (Google) Code Review [Mon, 17 Aug 2009 21:26:06 +0000 (14:26 -0700)]
Merge change 21587 into eclair
* changes:
BatteryService: Remove hard coded power supply names.
Android (Google) Code Review [Mon, 17 Aug 2009 21:22:24 +0000 (14:22 -0700)]
Merge change 21408 into donut
* changes:
Improved drawing/matrix support in layoutlib
Android (Google) Code Review [Mon, 17 Aug 2009 21:19:42 +0000 (14:19 -0700)]
Merge change 21572 into donut
* changes:
Add constants to adjust Vending input and output buffer sizes.
Jason Sams [Mon, 17 Aug 2009 21:02:06 +0000 (14:02 -0700)]
am
b93cdae7: Merge change 21570 into eclair
Merge commit '
b93cdae749c48a629331c9b039d3a0488752b82f'
* commit '
b93cdae749c48a629331c9b039d3a0488752b82f':
Update fountain and add writable flag to script slots.
Android (Google) Code Review [Mon, 17 Aug 2009 20:58:20 +0000 (13:58 -0700)]
Merge change 21570 into eclair
* changes:
Update fountain and add writable flag to script slots.
Android (Google) Code Review [Mon, 17 Aug 2009 20:42:24 +0000 (13:42 -0700)]
Merge change 21549 into donut
* changes:
Import revised translations. DO NOT MERGE
Fred Quintana [Mon, 17 Aug 2009 20:07:26 +0000 (13:07 -0700)]
am
5e787c42: - add a "isSyncable" flag to a given account/authority pair that indicates whether or not syncs should be attempted for it. - add public methods to get and set this parameter
Merge commit '
5e787c42f2a6b3afc8ec8320a08d51b2d44b8614'
* commit '
5e787c42f2a6b3afc8ec8320a08d51b2d44b8614':
- add a "isSyncable" flag to a given account/authority pair that
Romain Guy [Mon, 17 Aug 2009 20:05:05 +0000 (13:05 -0700)]
am
76c830b2: Merge change 21540 into eclair
Merge commit '
76c830b229fc21d5ea0ea28955084cc187e25fc6'
* commit '
76c830b229fc21d5ea0ea28955084cc187e25fc6':
Fix listview clicks with the trackball.
Android (Google) Code Review [Mon, 17 Aug 2009 20:00:26 +0000 (13:00 -0700)]
Merge change 21540 into eclair
* changes:
Fix listview clicks with the trackball.
Mathias Agopian [Mon, 17 Aug 2009 19:40:41 +0000 (12:40 -0700)]
am
0ef135d5: Merge change 21537 into eclair
Merge commit '
0ef135d5c79ff5b443b43f8743250044700a8bb5'
* commit '
0ef135d5c79ff5b443b43f8743250044700a8bb5':
really be more friendly with C
Android (Google) Code Review [Mon, 17 Aug 2009 19:37:25 +0000 (12:37 -0700)]
Merge change 21537 into eclair
* changes:
really be more friendly with C
Mathias Agopian [Mon, 17 Aug 2009 19:33:20 +0000 (12:33 -0700)]
really be more friendly with C
Dan Murphy [Mon, 17 Aug 2009 19:31:44 +0000 (12:31 -0700)]
am
921831b4: Merge change 21522 into eclair
Merge commit '
921831b4dcad1898c265889430a32367e99ef6c1'
* commit '
921831b4dcad1898c265889430a32367e99ef6c1':
Dock changes:Docking station intents
Android (Google) Code Review [Mon, 17 Aug 2009 19:27:06 +0000 (12:27 -0700)]
Merge change 21522 into eclair
* changes:
Dock changes:Docking station intents
Dianne Hackborn [Mon, 17 Aug 2009 18:52:06 +0000 (11:52 -0700)]
am
1a797546: Merge change 21380 into eclair
Merge commit '
1a797546d75d2c85d6fefeefdc55de051aa66018'
* commit '
1a797546d75d2c85d6fefeefdc55de051aa66018':
More work on wallpapers.
Android (Google) Code Review [Mon, 17 Aug 2009 18:46:57 +0000 (11:46 -0700)]
Merge change 21380 into eclair
* changes:
More work on wallpapers.
Romain Guy [Mon, 17 Aug 2009 18:09:21 +0000 (11:09 -0700)]
am
54ba86f0: Merge change 21512 into eclair
Merge commit '
54ba86f0e236a55fb4dc3aabbd81078f586321a5'
* commit '
54ba86f0e236a55fb4dc3aabbd81078f586321a5':
Honor the clickable and enabled properties in ListView.
Android (Google) Code Review [Mon, 17 Aug 2009 18:07:08 +0000 (11:07 -0700)]
Merge change 21512 into eclair
* changes:
Honor the clickable and enabled properties in ListView.
Mike Lockwood [Mon, 17 Aug 2009 17:59:49 +0000 (10:59 -0700)]
am
9dc2355b: Merge change 21492 into eclair
Merge commit '
9dc2355b9bdfdaadb72936b5ad865193a2af58c8'
* commit '
9dc2355b9bdfdaadb72936b5ad865193a2af58c8':
WifiService: Hash based on both SSID and BSSID in scan result cache.
Mike Lockwood [Mon, 17 Aug 2009 17:59:46 +0000 (10:59 -0700)]
am
56e7ba29: Merge change 21510 into eclair
Merge commit '
56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c'
* commit '
56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c':
LocationManagerService: Add NullPointerException to avoid change in behavior.
Andreas Huber [Mon, 17 Aug 2009 17:59:41 +0000 (10:59 -0700)]
am
ffbd2426: Merge change 21340 into eclair
Merge commit '
ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5'
* commit '
ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5':
Squashed commit of the following:
Jeff Sharkey [Mon, 17 Aug 2009 17:59:35 +0000 (10:59 -0700)]
am
fd0d6275: Fix ExpandableListView context menus when has header views.
Merge commit '
fd0d627569cb250f7060a83161cc845b9616e5a1'
* commit '
fd0d627569cb250f7060a83161cc845b9616e5a1':
Fix ExpandableListView context menus when has header views.
Amith Yamasani [Mon, 17 Aug 2009 17:59:30 +0000 (10:59 -0700)]
am
7d68dae9: Merge change 21494 into eclair
Merge commit '
7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e'
* commit '
7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e':
Allow animation styles to be applied to popup windows.
Grace Kloba [Mon, 17 Aug 2009 17:59:21 +0000 (10:59 -0700)]
am
86192c61: Merge change 21442 into eclair
Merge commit '
86192c614c317b428e10c2dc9052a07304aa6c3f'
* commit '
86192c614c317b428e10c2dc9052a07304aa6c3f':
Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
Mike Lockwood [Mon, 17 Aug 2009 17:59:12 +0000 (10:59 -0700)]
am
6ba7ae1e: LocationManagerService: Fix null pointer check in sendExtraCommand().
Merge commit '
6ba7ae1e4c3c04f6a71380b913ad79f83b00a628'
* commit '
6ba7ae1e4c3c04f6a71380b913ad79f83b00a628':
LocationManagerService: Fix null pointer check in sendExtraCommand().
Chih-Chung Chang [Mon, 17 Aug 2009 17:59:05 +0000 (10:59 -0700)]
am
0ff7a463: Merge change 21473 into eclair
Merge commit '
0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0'
* commit '
0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0':
Fix
1860351: Put datetime in jpeg exif to datetaken field.
Mike Lockwood [Mon, 17 Aug 2009 17:59:02 +0000 (10:59 -0700)]
am
06952d92: (-s ours) DO NOT MERGE - cherry-picked from master:
Merge commit '
06952d9299c23ee15df0825e75934971cfecf2ba'
* commit '
06952d9299c23ee15df0825e75934971cfecf2ba':
DO NOT MERGE - cherry-picked from master:
Romain Guy [Mon, 17 Aug 2009 17:58:55 +0000 (10:58 -0700)]
Android (Google) Code Review [Mon, 17 Aug 2009 17:47:06 +0000 (10:47 -0700)]
Merge change 21492 into eclair
* changes:
WifiService: Hash based on both SSID and BSSID in scan result cache.
Android (Google) Code Review [Mon, 17 Aug 2009 17:29:23 +0000 (10:29 -0700)]
Merge change 21510 into eclair
* changes:
LocationManagerService: Add NullPointerException to avoid change in behavior.
Android (Google) Code Review [Mon, 17 Aug 2009 17:27:41 +0000 (10:27 -0700)]
Merge change 21340 into eclair
* changes:
Squashed commit of the following:
Android (Google) Code Review [Mon, 17 Aug 2009 16:48:55 +0000 (09:48 -0700)]
Merge change 21494 into eclair
* changes:
Allow animation styles to be applied to popup windows.
Android (Google) Code Review [Mon, 17 Aug 2009 16:19:23 +0000 (09:19 -0700)]
Merge change 21442 into eclair
* changes:
Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
Android (Google) Code Review [Mon, 17 Aug 2009 12:16:14 +0000 (05:16 -0700)]
Merge change 21473 into eclair
* changes:
Fix
1860351: Put datetime in jpeg exif to datetaken field.
Android (Google) Code Review [Mon, 17 Aug 2009 06:24:12 +0000 (23:24 -0700)]
Merge change 21471 into eclair
* changes:
Add Galaxy wallpaper
Fred Quintana [Mon, 17 Aug 2009 00:20:21 +0000 (17:20 -0700)]
Android (Google) Code Review [Mon, 17 Aug 2009 00:14:20 +0000 (17:14 -0700)]
Merge change 21432 into eclair
* changes:
do not merge: cherrypicked
3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
Jeff Sharkey [Sun, 16 Aug 2009 23:39:35 +0000 (16:39 -0700)]
am
403d7ac7: Bring back SHOULD_SYNC flag so sync groups can be edited.
Merge commit '
403d7ac7d14e87ecc7df25a1fbb79649ec5ada90'
* commit '
403d7ac7d14e87ecc7df25a1fbb79649ec5ada90':
Bring back SHOULD_SYNC flag so sync groups can be edited.
Yong Zhang [Sat, 15 Aug 2009 22:32:21 +0000 (15:32 -0700)]
am
fa2944d9: Replace loop-delay in setPowerStateToDesired() with async approach
Merge commit '
fa2944d93f4c5050fb4a99d90006791c2995b31c'
* commit '
fa2944d93f4c5050fb4a99d90006791c2995b31c':
Replace loop-delay in setPowerStateToDesired() with async approach
Wink Saville [Sat, 15 Aug 2009 18:21:41 +0000 (11:21 -0700)]
am
e6a9bcb7: A hack that when restartRadio is called the CdmaDataConnectionTracker to retry a connection and possibly reconnect after a temporary data loss.
Merge commit '
e6a9bcb7e8280512b0f68230fb72a004f86c8ae1'
* commit '
e6a9bcb7e8280512b0f68230fb72a004f86c8ae1':
A hack that when restartRadio is called the CdmaDataConnectionTracker
Wink Saville [Sat, 15 Aug 2009 16:51:29 +0000 (09:51 -0700)]
am
ad4d9e5b: Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS and when data roaming is enabled reset the retry manager.
Merge commit '
ad4d9e5bebb5a9ba01c1459d941019887f4a7d6d'
* commit '
ad4d9e5bebb5a9ba01c1459d941019887f4a7d6d':
Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS
Dianne Hackborn [Sat, 15 Aug 2009 07:05:29 +0000 (00:05 -0700)]
am
549db46c: Merge change 21413 into eclair
Merge commit '
549db46cb31725a66cd32ad4e0abb0d60d893fca'
* commit '
549db46cb31725a66cd32ad4e0abb0d60d893fca':
Fix aapt to be able to add configs from overlays.
Android (Google) Code Review [Sat, 15 Aug 2009 07:02:36 +0000 (00:02 -0700)]
Merge change 21413 into eclair
* changes:
Fix aapt to be able to add configs from overlays.
Mathias Agopian [Sat, 15 Aug 2009 03:11:09 +0000 (20:11 -0700)]
am
7193a587: Merge change 21401 into eclair
Merge commit '
7193a58763ff73ba84bf4ac1c8f3f745b0a18836'
* commit '
7193a58763ff73ba84bf4ac1c8f3f745b0a18836':
make sure to update a surface's usage bits when it changes, instead of only the first time.
Android (Google) Code Review [Sat, 15 Aug 2009 03:07:51 +0000 (20:07 -0700)]
Merge change 21401 into eclair
* changes:
make sure to update a surface's usage bits when it changes, instead of only the first time.
Mathias Agopian [Sat, 15 Aug 2009 01:52:17 +0000 (18:52 -0700)]
make sure to update a surface's usage bits when it changes, instead of only the first time.
also fixed a few locking issues in Surface and commented how each member is protected.
Mike Lockwood [Sat, 15 Aug 2009 01:45:40 +0000 (18:45 -0700)]
am
82726f04: Merge change 21298 into eclair
Merge commit '
82726f045de91b899502a54ca76d234c43a1ba4b'
* commit '
82726f045de91b899502a54ca76d234c43a1ba4b':
ConnectivityService: Do not send broadcasts until the system is ready.