OSDN Git Service
Scott Main [Mon, 12 Apr 2010 23:12:24 +0000 (16:12 -0700)]
am
3f371793: Merge "docs: fix bug
2590728" into froyo
Merge commit '
3f371793287b6f10badc018fb9eaca33ac51a8e7' into froyo-plus-aosp
* commit '
3f371793287b6f10badc018fb9eaca33ac51a8e7':
docs: fix bug
2590728
Scott Main [Mon, 12 Apr 2010 23:09:28 +0000 (16:09 -0700)]
Merge "docs: fix bug
2590728" into froyo
Christopher Tate [Mon, 12 Apr 2010 22:16:07 +0000 (15:16 -0700)]
am
b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '
b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp
* commit '
b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
API CHANGE: remove obsolete constants and hide some methods
Christopher Tate [Mon, 12 Apr 2010 22:13:35 +0000 (15:13 -0700)]
Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Andreas Huber [Mon, 12 Apr 2010 21:19:23 +0000 (14:19 -0700)]
am
6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '
6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp
* commit '
6dbf80d086d03d95c5f6331719edd6dd6dac0361':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Andreas Huber [Mon, 12 Apr 2010 21:16:34 +0000 (14:16 -0700)]
Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo
Kenny Root [Mon, 12 Apr 2010 19:20:50 +0000 (12:20 -0700)]
am
290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo
Merge commit '
290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp
* commit '
290a48b365479eccd16023b5de0d92063bb68b4d':
Fix typos in name of density-independent pixels
Kenny Root [Mon, 12 Apr 2010 19:19:08 +0000 (12:19 -0700)]
Merge "Fix typos in name of density-independent pixels" into froyo
Jean-Michel Trivi [Mon, 12 Apr 2010 19:07:44 +0000 (12:07 -0700)]
am
12221b6f: Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corr
Merge commit '
12221b6f7c86349e3dcf89f814355e41f9e58cbf' into froyo-plus-aosp
* commit '
12221b6f7c86349e3dcf89f814355e41f9e58cbf':
Fix monkey bug
2586534 java.util.ConcurrentModificationException
Jean-Michel Trivi [Mon, 12 Apr 2010 19:05:08 +0000 (12:05 -0700)]
Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo
Patrick Scott [Mon, 12 Apr 2010 18:53:09 +0000 (11:53 -0700)]
am
36acfbc2: Add a bulk request method for bookmark icons.
Merge commit '
36acfbc2b8df6e62f2d583933eca3a49265279a6' into froyo-plus-aosp
* commit '
36acfbc2b8df6e62f2d583933eca3a49265279a6':
Add a bulk request method for bookmark icons.
Andreas Huber [Mon, 12 Apr 2010 18:05:36 +0000 (11:05 -0700)]
am
1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Merge commit '
1d7a8b448e9371685894b6b02d29bcd3ae959545' into froyo-plus-aosp
* commit '
1d7a8b448e9371685894b6b02d29bcd3ae959545':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
Andreas Huber [Mon, 12 Apr 2010 18:02:27 +0000 (11:02 -0700)]
Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Andreas Huber [Mon, 12 Apr 2010 17:14:08 +0000 (10:14 -0700)]
am
cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Merge commit '
cdded187d20bdc6379c5a09bdd2002fa070b745d' into froyo-plus-aosp
* commit '
cdded187d20bdc6379c5a09bdd2002fa070b745d':
Ignore corrupt aac audio frames and substitute silence.
Andreas Huber [Mon, 12 Apr 2010 17:12:29 +0000 (10:12 -0700)]
am
040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Merge commit '
040301cad17e447d760e7b7e54b79c8c294415ea' into froyo-plus-aosp
* commit '
040301cad17e447d760e7b7e54b79c8c294415ea':
Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Andreas Huber [Mon, 12 Apr 2010 17:11:32 +0000 (10:11 -0700)]
Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Leon Scroggins [Mon, 12 Apr 2010 15:11:40 +0000 (08:11 -0700)]
am
63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '
63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp
* commit '
63284ede623ca8a4119f1f44b86fbf017faba8dc':
Do not check mWebTextView's focus state to determine editing mode.
Wu-cheng Li [Sat, 10 Apr 2010 18:42:15 +0000 (11:42 -0700)]
am
c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp
* commit '
c58b42327df5fbc826e2fcc2674ab6db0edfcd92':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Scott Main [Sat, 10 Apr 2010 18:42:10 +0000 (11:42 -0700)]
am
2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '
2a547829fe162c52ea1b1168f47d25fb1b40497d' into froyo-plus-aosp
* commit '
2a547829fe162c52ea1b1168f47d25fb1b40497d':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Dianne Hackborn [Sat, 10 Apr 2010 18:42:05 +0000 (11:42 -0700)]
am
17de1532: Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Merge commit '
17de1532a950f7ee961debab93a7977292b7f1f3' into froyo-plus-aosp
* commit '
17de1532a950f7ee961debab93a7977292b7f1f3':
Fix issue #
2581524: Car home icon should always go to car home
Robert Greenwalt [Sat, 10 Apr 2010 18:42:02 +0000 (11:42 -0700)]
am
5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo
Merge commit '
5cc072522b51f796085a73545a3dd34a02877059' into froyo-plus-aosp
* commit '
5cc072522b51f796085a73545a3dd34a02877059':
Add warning magic to be a bit more reasonable.
Yu Shan Emily Lau [Sat, 10 Apr 2010 18:41:58 +0000 (11:41 -0700)]
am
15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Merge commit '
15b02f04c7b5e895dd8ebbb9448863a7d608b00f' into froyo-plus-aosp
* commit '
15b02f04c7b5e895dd8ebbb9448863a7d608b00f':
Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Romain Guy [Sat, 10 Apr 2010 18:41:54 +0000 (11:41 -0700)]
am
4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Merge commit '
4525c98114c1e570ecef84521f66095e866af77d' into froyo-plus-aosp
* commit '
4525c98114c1e570ecef84521f66095e866af77d':
Fix regression introduced when fixing focus issue with ScrollView.
Wink Saville [Sat, 10 Apr 2010 18:41:50 +0000 (11:41 -0700)]
am
a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Merge commit '
a18c824c029c14093b3d06d0a021c5397be667fb' into froyo-plus-aosp
* commit '
a18c824c029c14093b3d06d0a021c5397be667fb':
Fix a FATAL ClassCastException in DataConnection.java
Wei Huang [Sat, 10 Apr 2010 18:41:45 +0000 (11:41 -0700)]
am
c621b65d: Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit '
c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da' into froyo-plus-aosp
* commit '
c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da':
bug #
2542580: add the appropriate mdpi asset for chat icon.
Jesse Wilson [Sat, 10 Apr 2010 18:41:38 +0000 (11:41 -0700)]
am
bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit '
bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp
* commit '
bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Mike Reed [Sat, 10 Apr 2010 18:41:30 +0000 (11:41 -0700)]
am
a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo
Merge commit '
a3c4c219c21e61ca4a642a35610dea07c437a647' into froyo-plus-aosp
* commit '
a3c4c219c21e61ca4a642a35610dea07c437a647':
final versions of these fonts from ascender, including GPOS 'mark' feature
Robert Greenwalt [Sat, 10 Apr 2010 18:41:25 +0000 (11:41 -0700)]
am
4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
Merge commit '
4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp
* commit '
4dceedc133ef0487577badb67100d20473d87762':
Make ThrottleService notice policy changes.
Dan Egnor [Sat, 10 Apr 2010 18:41:20 +0000 (11:41 -0700)]
am
2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
Merge commit '
2d3df559dea9ebb0ab263c2df26e8a345ed74d12' into froyo-plus-aosp
* commit '
2d3df559dea9ebb0ab263c2df26e8a345ed74d12':
Fix sim build (sim doesn't have strl*() reliably...)
Kristian Monsen [Sat, 10 Apr 2010 18:41:14 +0000 (11:41 -0700)]
am
34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
Merge commit '
34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp
* commit '
34959e3fe87012d554af07fd6ad294b2ce3daea7':
Do not create intents for application/xhtml+xml
Grace Kloba [Sat, 10 Apr 2010 18:41:09 +0000 (11:41 -0700)]
am
e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Merge commit '
e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp
* commit '
e67e6b94fd282283f1ffa2299fae536bee099715':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
Scott Main [Sat, 10 Apr 2010 00:03:55 +0000 (17:03 -0700)]
Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Dianne Hackborn [Fri, 9 Apr 2010 23:52:41 +0000 (16:52 -0700)]
Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 23:47:10 +0000 (16:47 -0700)]
Merge "Add warning magic to be a bit more reasonable." into froyo
Yu Shan Emily Lau [Fri, 9 Apr 2010 23:41:37 +0000 (16:41 -0700)]
Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Romain Guy [Fri, 9 Apr 2010 23:08:17 +0000 (16:08 -0700)]
Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Wink Saville [Fri, 9 Apr 2010 22:39:33 +0000 (15:39 -0700)]
Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Wei Huang [Fri, 9 Apr 2010 22:34:46 +0000 (15:34 -0700)]
Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Jesse Wilson [Fri, 9 Apr 2010 21:01:07 +0000 (14:01 -0700)]
Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Jesse Wilson [Thu, 8 Apr 2010 21:20:57 +0000 (14:20 -0700)]
Move the public method HttpDateTime.parse() into AndroidHttpClient.
See bug http://b/
2553589
Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
Mike Reed [Fri, 9 Apr 2010 20:10:07 +0000 (13:10 -0700)]
Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 20:00:05 +0000 (13:00 -0700)]
Merge "Make ThrottleService notice policy changes." into froyo
Dan Egnor [Fri, 9 Apr 2010 19:50:11 +0000 (12:50 -0700)]
Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo
Kristian Monsen [Fri, 9 Apr 2010 17:59:20 +0000 (10:59 -0700)]
Merge "Do not create intents for application/xhtml+xml" into froyo
Grace Kloba [Fri, 9 Apr 2010 17:49:42 +0000 (10:49 -0700)]
Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Robert Greenwalt [Fri, 9 Apr 2010 16:32:03 +0000 (09:32 -0700)]
am
cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
Merge commit '
cb27041034343a6a15f0812d04f66fefbed30686' into froyo-plus-aosp
* commit '
cb27041034343a6a15f0812d04f66fefbed30686':
Roaming data doesn't count against limits
Robert Greenwalt [Fri, 9 Apr 2010 16:29:20 +0000 (09:29 -0700)]
Merge "Roaming data doesn't count against limits" into froyo
Eric Laurent [Fri, 9 Apr 2010 15:53:08 +0000 (08:53 -0700)]
am
9da7730d: Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
9da7730d5f97270c356ee86298c5d6d45f39b264' into froyo-plus-aosp
* commit '
9da7730d5f97270c356ee86298c5d6d45f39b264':
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
Eric Laurent [Fri, 9 Apr 2010 15:48:32 +0000 (08:48 -0700)]
Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Andreas Huber [Fri, 9 Apr 2010 14:06:11 +0000 (07:06 -0700)]
am
4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
Merge commit '
4be2461f06de3cf70a3126d2e4590d35210b8397' into froyo-plus-aosp
* commit '
4be2461f06de3cf70a3126d2e4590d35210b8397':
Support for ID3 V2.4 tags.
Andreas Huber [Fri, 9 Apr 2010 14:01:58 +0000 (07:01 -0700)]
Merge "Support for ID3 V2.4 tags." into froyo
Patrick Scott [Fri, 9 Apr 2010 13:37:11 +0000 (06:37 -0700)]
am
da9a22bc: Save/restore the picture in a background thread.
Merge commit '
da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07' into froyo-plus-aosp
* commit '
da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07':
Save/restore the picture in a background thread.
Eric Laurent [Fri, 9 Apr 2010 13:11:48 +0000 (06:11 -0700)]
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
This changes fixes the issue for the direct output thread that was not
addressed by commit
71f37cd8a175ee00635cb91506d6810fd02b5b51.
Change-Id: I1bbe26be5f444415dd97270e49257650f5d2858f
Dan Egnor [Fri, 9 Apr 2010 06:04:16 +0000 (23:04 -0700)]
am
78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Merge commit '
78158db51029e7dbe160e60af0deb7594bec051d' into froyo-plus-aosp
* commit '
78158db51029e7dbe160e60af0deb7594bec051d':
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Dan Egnor [Fri, 9 Apr 2010 05:39:27 +0000 (22:39 -0700)]
am
70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
Merge commit '
70c294b205f7b27308c45bf893270bef6081d39b' into froyo-plus-aosp
* commit '
70c294b205f7b27308c45bf893270bef6081d39b':
Fix OperationScheduler moratorium calculation for clock rollback case.
Xavier Ducrohet [Fri, 9 Apr 2010 05:39:24 +0000 (22:39 -0700)]
am
bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
Merge commit '
bbc6e33b1f7fff3280c3fa44836833f4bab4bf99' into froyo-plus-aosp
* commit '
bbc6e33b1f7fff3280c3fa44836833f4bab4bf99':
Adds back the finalize method on the replaced Paint class.
Jeff Brown [Fri, 9 Apr 2010 05:39:19 +0000 (22:39 -0700)]
am
37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
Merge commit '
37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp
* commit '
37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
Dan Egnor [Fri, 9 Apr 2010 00:38:28 +0000 (17:38 -0700)]
Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
Dan Egnor [Fri, 9 Apr 2010 00:24:26 +0000 (17:24 -0700)]
Fix OperationScheduler moratorium calculation for clock rollback case.
Make the unit test exercise some clock-rollback scenarios, using
a properly injected artificial clock.
Bug:
2579585
Change-Id: I6f81c32318ba27429bd30ff53b48449218e4ac64
Xavier Ducrohet [Fri, 9 Apr 2010 00:29:39 +0000 (17:29 -0700)]
Merge "Adds back the finalize method on the replaced Paint class." into froyo
Jeff Brown [Fri, 9 Apr 2010 00:18:15 +0000 (17:18 -0700)]
Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
Irfan Sheriff [Fri, 9 Apr 2010 00:01:59 +0000 (17:01 -0700)]
am
c9b6851a: Throttling framework addins
Merge commit '
c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp
* commit '
c9b6851af68bdc20c4903b16c344e9f116647219':
Throttling framework addins
Jeff Brown [Thu, 8 Apr 2010 23:44:40 +0000 (16:44 -0700)]
am
267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
Merge commit '
267f0a6b683a2de75450afee59d2058b292c72c8' into froyo-plus-aosp
* commit '
267f0a6b683a2de75450afee59d2058b292c72c8':
Workaround NPE caused by packages missing signatures.
Jeff Brown [Thu, 8 Apr 2010 23:44:37 +0000 (16:44 -0700)]
am
779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
Merge commit '
779a4ca84d62a6e4f18a723cfc18c5d035f60fed' into froyo-plus-aosp
* commit '
779a4ca84d62a6e4f18a723cfc18c5d035f60fed':
Improve robustness of package manager certificate collection.
Jeff Brown [Thu, 8 Apr 2010 23:41:47 +0000 (16:41 -0700)]
Merge "Workaround NPE caused by packages missing signatures." into froyo
Jeff Brown [Thu, 8 Apr 2010 23:41:37 +0000 (16:41 -0700)]
Merge "Improve robustness of package manager certificate collection." into froyo
Brett Chabot [Thu, 8 Apr 2010 23:39:50 +0000 (16:39 -0700)]
am
185f1a96: Merge "IME test fixes." into froyo
Merge commit '
185f1a96683f59e2ff617b688449fd490e364be7' into froyo-plus-aosp
* commit '
185f1a96683f59e2ff617b688449fd490e364be7':
IME test fixes.
Brett Chabot [Thu, 8 Apr 2010 23:36:02 +0000 (16:36 -0700)]
Merge "IME test fixes." into froyo
Robert Greenwalt [Thu, 8 Apr 2010 23:18:31 +0000 (16:18 -0700)]
am
cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
Merge commit '
cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp
* commit '
cc691f5061f4f5e687bf847078ee2ba387bdacb7':
Updating some notificiation UI for Throttling
Robert Greenwalt [Thu, 8 Apr 2010 23:09:31 +0000 (16:09 -0700)]
Merge "Updating some notificiation UI for Throttling" into froyo
Dan Egnor [Thu, 8 Apr 2010 21:48:50 +0000 (14:48 -0700)]
am
5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
Merge commit '
5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp
* commit '
5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
Change TrafficStats to a new JNI implementation.
Dan Egnor [Thu, 8 Apr 2010 21:45:07 +0000 (14:45 -0700)]
Merge "Change TrafficStats to a new JNI implementation." into froyo
Dan Egnor [Thu, 8 Apr 2010 21:15:29 +0000 (14:15 -0700)]
am
21248080: Merge "Missed these ones in the previous rename." into froyo
Merge commit '
2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp
* commit '
2124808060a1eb5ea396238b7b99d2ed266b0b53':
Missed these ones in the previous rename.
Dan Egnor [Thu, 8 Apr 2010 21:10:50 +0000 (14:10 -0700)]
Merge "Missed these ones in the previous rename." into froyo
Grace Kloba [Thu, 8 Apr 2010 21:08:35 +0000 (14:08 -0700)]
am
3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate can drop by 30%.
Merge commit '
3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp
* commit '
3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
For performance reason, we choose to block the picture
Grace Kloba [Thu, 8 Apr 2010 21:05:05 +0000 (14:05 -0700)]
Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo
Brad Fitzpatrick [Thu, 8 Apr 2010 21:04:43 +0000 (14:04 -0700)]
am
c62cdef4: Merge "Rename logtag for clarity." into froyo
Merge commit '
c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp
* commit '
c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
Rename logtag for clarity.
Brad Fitzpatrick [Thu, 8 Apr 2010 21:01:23 +0000 (14:01 -0700)]
Merge "Rename logtag for clarity." into froyo
Jeff Brown [Thu, 8 Apr 2010 20:49:55 +0000 (13:49 -0700)]
am
ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit '
ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp
* commit '
ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Andreas Huber [Thu, 8 Apr 2010 19:45:59 +0000 (12:45 -0700)]
am
eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Merge commit '
eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp
* commit '
eb12e45f7a92fd424988451256c82605d086245d':
Refactor connection/redirection code, support redirects on reconnection.
Robert Greenwalt [Thu, 8 Apr 2010 19:45:51 +0000 (12:45 -0700)]
am
2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '
2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp
* commit '
2b4b5738011f5ccb118ad15721fd757c85448966':
Add service to monitor/control the flow of data.
Andreas Huber [Thu, 8 Apr 2010 19:44:33 +0000 (12:44 -0700)]
Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Robert Greenwalt [Thu, 8 Apr 2010 19:42:09 +0000 (12:42 -0700)]
Merge "Add service to monitor/control the flow of data." into froyo
Dianne Hackborn [Thu, 8 Apr 2010 18:39:03 +0000 (11:39 -0700)]
am
2670105e: Merge "Fix issue #
2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Merge commit '
2670105ee6929d3036a1a7134400730f214f0f7e' into froyo-plus-aosp
* commit '
2670105ee6929d3036a1a7134400730f214f0f7e':
Fix issue #
2580316: Contacts and Phone app not supporting landscape mode...
The Android Open Source Project [Thu, 8 Apr 2010 18:35:37 +0000 (11:35 -0700)]
merge from open-source master
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
Dianne Hackborn [Thu, 8 Apr 2010 18:35:27 +0000 (11:35 -0700)]
Merge "Fix issue #
2580316: Contacts and Phone app not supporting landscape mode..." into froyo
The Android Open Source Project [Thu, 8 Apr 2010 18:27:55 +0000 (11:27 -0700)]
merge from open-source master
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
Scott Main [Thu, 8 Apr 2010 18:25:36 +0000 (11:25 -0700)]
am
4981863d: Merge "docs: revisions to the installLocation documentation" into froyo
Merge commit '
4981863de52941f053bf002ae2f9c8f705534599' into froyo-plus-aosp
* commit '
4981863de52941f053bf002ae2f9c8f705534599':
docs: revisions to the installLocation documentation
Scott Main [Thu, 8 Apr 2010 18:22:42 +0000 (11:22 -0700)]
Merge "docs: revisions to the installLocation documentation" into froyo
Jaikumar Ganesh [Thu, 8 Apr 2010 17:08:25 +0000 (10:08 -0700)]
am
d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
Merge commit '
d1a95f975b03371a937da87735359c286a6de7f3' into froyo-plus-aosp
* commit '
d1a95f975b03371a937da87735359c286a6de7f3':
Don't allow connection to profiles in TURNING_OFF state.
Jaikumar Ganesh [Thu, 8 Apr 2010 17:01:50 +0000 (10:01 -0700)]
Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo
Andrei Popescu [Thu, 8 Apr 2010 16:10:09 +0000 (09:10 -0700)]
am
3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Merge commit '
3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp
* commit '
3fe36fe589809b732db12054428166adb069f53b':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
Andrei Popescu [Thu, 8 Apr 2010 16:07:32 +0000 (09:07 -0700)]
Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Andreas Huber [Thu, 8 Apr 2010 15:31:20 +0000 (08:31 -0700)]
am
c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error hand
Merge commit '
c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp
* commit '
c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Andreas Huber [Thu, 8 Apr 2010 15:27:20 +0000 (08:27 -0700)]
Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:10:12 +0000 (06:10 -0700)]
am
8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
Merge commit '
8d318958a3eb3abac3696c436e27e51e0bc2c6f8' into froyo-plus-aosp
* commit '
8d318958a3eb3abac3696c436e27e51e0bc2c6f8':
Transparent alarm icons for lockscreen.
Daniel Sandler [Thu, 8 Apr 2010 13:10:09 +0000 (06:10 -0700)]
am
9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
Merge commit '
9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp
* commit '
9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
Add emergency call button to PUK'd lockscreen.
Daniel Sandler [Thu, 8 Apr 2010 13:07:57 +0000 (06:07 -0700)]
Merge "Transparent alarm icons for lockscreen." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:06:50 +0000 (06:06 -0700)]
Merge "Add emergency call button to PUK'd lockscreen." into froyo
Dianne Hackborn [Thu, 8 Apr 2010 05:39:18 +0000 (22:39 -0700)]
am
ecb0e637: Fix issue #
2541849: System crash when an app with active notifications...
Merge commit '
ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp
* commit '
ecb0e637870553f9c12dc6b9178de0512563af9c':
Fix issue #
2541849: System crash when an app with active notifications...
OSDN Git Service
