OSDN Git Service
Robert Greenwalt [Fri, 9 Apr 2010 16:35:55 +0000 (09:35 -0700)]
am
a68780dd: am
cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
Merge commit '
a68780dd0f0af0938b72fdf6539db575da471028' into kraken
* commit '
a68780dd0f0af0938b72fdf6539db575da471028':
Roaming data doesn't count against limits
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:58:30 +0000 (08:58 -0700)]
am
1921527c: am
9da7730d: Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
1921527c8dbcb9f10683e43bca12648cb2c6e5b7' into kraken
* commit '
1921527c8dbcb9f10683e43bca12648cb2c6e5b7':
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
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:09:49 +0000 (07:09 -0700)]
am
91ce0826: am
4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
Merge commit '
91ce08269600a5b46c84d9480212bf17e1107c2f' into kraken
* commit '
91ce08269600a5b46c84d9480212bf17e1107c2f':
Support for ID3 V2.4 tags.
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:43:47 +0000 (06:43 -0700)]
am
54c5330f: am
da9a22bc: Save/restore the picture in a background thread.
Merge commit '
54c5330f23adc0f9928936f44b2d20d327d900c8' into kraken
* commit '
54c5330f23adc0f9928936f44b2d20d327d900c8':
Save/restore the picture in a background thread.
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:08:56 +0000 (23:08 -0700)]
am
f5d506d9: am
78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
Merge commit '
f5d506d92958d43449cb9ef77e6c9b6087e1cd68' into kraken
* commit '
f5d506d92958d43449cb9ef77e6c9b6087e1cd68':
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
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:50:50 +0000 (22:50 -0700)]
am
a2bf7343: am
70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
Merge commit '
a2bf73435ba776de1a55847276fc54c00648971b' into kraken
* commit '
a2bf73435ba776de1a55847276fc54c00648971b':
Fix OperationScheduler moratorium calculation for clock rollback case.
Xavier Ducrohet [Fri, 9 Apr 2010 05:50:46 +0000 (22:50 -0700)]
am
3895007d: am
bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
Merge commit '
3895007d523a9d5c92b971908f898f19a8c9f8ff' into kraken
* commit '
3895007d523a9d5c92b971908f898f19a8c9f8ff':
Adds back the finalize method on the replaced Paint class.
Jeff Brown [Fri, 9 Apr 2010 05:50:42 +0000 (22:50 -0700)]
am
6c099149: am
37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
Merge commit '
6c099149daff56ca04ab40a86950e7b61caf6505' into kraken
* commit '
6c099149daff56ca04ab40a86950e7b61caf6505':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
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.
Mathias Agopian [Fri, 9 Apr 2010 02:10:52 +0000 (19:10 -0700)]
Merge "fix [
2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
Mathias Agopian [Fri, 9 Apr 2010 01:34:07 +0000 (18:34 -0700)]
fix [
2420565] Surface.lockCanvas() updates the dirty region too often
There was a bug where we were we could be reallocating buffers for no reason.
Change-Id: Ieb8a81a289da9339ab7faf987cd3a73428943c1a
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:05:06 +0000 (17:05 -0700)]
am
750f3211: am
c9b6851a: Throttling framework addins
Merge commit '
750f32117b96a8af4fb03fae459a80f79a667fca' into kraken
* commit '
750f32117b96a8af4fb03fae459a80f79a667fca':
Throttling framework addins
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:47:19 +0000 (16:47 -0700)]
am
b00771aa: am
267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
Merge commit '
b00771aa806e9fd43669f09e8c348f2b4457ca0b' into kraken
* commit '
b00771aa806e9fd43669f09e8c348f2b4457ca0b':
Workaround NPE caused by packages missing signatures.
Jeff Brown [Thu, 8 Apr 2010 23:47:15 +0000 (16:47 -0700)]
am
6742a0c9: am
779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
Merge commit '
6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0' into kraken
* commit '
6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0':
Improve robustness of package manager certificate collection.
Brett Chabot [Thu, 8 Apr 2010 23:45:16 +0000 (16:45 -0700)]
am
133d0b70: am
185f1a96: Merge "IME test fixes." into froyo
Merge commit '
133d0b70ff569dad9d996be49fdea10c2bdd4b97' into kraken
* commit '
133d0b70ff569dad9d996be49fdea10c2bdd4b97':
IME test fixes.
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:25:54 +0000 (16:25 -0700)]
am
6cf3d4aa: am
cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
Merge commit '
6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken
* commit '
6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
Updating some notificiation UI for Throttling
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:53:06 +0000 (14:53 -0700)]
am
c1420832: am
5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
Merge commit '
c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken
* commit '
c1420832a8f9c7fa62b143ce63c71062b3969c1b':
Change TrafficStats to a new JNI implementation.
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:19:52 +0000 (14:19 -0700)]
am
f1f00f5b: am
21248080: Merge "Missed these ones in the previous rename." into froyo
Merge commit '
f1f00f5bddd6b222879166f4528055a30bed307e' into kraken
* commit '
f1f00f5bddd6b222879166f4528055a30bed307e':
Missed these ones in the previous rename.
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.
Grace Kloba [Thu, 8 Apr 2010 21:12:58 +0000 (14:12 -0700)]
am
642d1556: 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 ca
Merge commit '
642d1556f13ac13f07515309288214e532029c50' into kraken
* commit '
642d1556f13ac13f07515309288214e532029c50':
For performance reason, we choose to block the picture
Dan Egnor [Thu, 8 Apr 2010 21:10:50 +0000 (14:10 -0700)]
Merge "Missed these ones in the previous rename." into froyo
Brad Fitzpatrick [Thu, 8 Apr 2010 21:08:56 +0000 (14:08 -0700)]
am
4183b514: am
c62cdef4: Merge "Rename logtag for clarity." into froyo
Merge commit '
4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken
* commit '
4183b514bb72d96e8ed925c14266a23067c02fe5':
Rename logtag for clarity.
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:51:48 +0000 (13:51 -0700)]
am
a30b596d: am
ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit '
a30b596d6ac46d88fd92dd3e1806b5de9b62b10b' into kraken
* commit '
a30b596d6ac46d88fd92dd3e1806b5de9b62b10b':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
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:49:41 +0000 (12:49 -0700)]
am
b52e9f74: am
eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Merge commit '
b52e9f748cefaad01fc66a73ddfa707f2446895c' into kraken
* commit '
b52e9f748cefaad01fc66a73ddfa707f2446895c':
Refactor connection/redirection code, support redirects on reconnection.
Robert Greenwalt [Thu, 8 Apr 2010 19:49:38 +0000 (12:49 -0700)]
am
6f72a313: am
2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '
6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken
* commit '
6f72a313a042fdf0a5345f83eda74c5970b7db05':
Add service to monitor/control the flow of data.
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:41:38 +0000 (11:41 -0700)]
am
2c5c9bb8: am
2670105e: Merge "Fix issue #
2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Merge commit '
2c5c9bb89b539a1a97d093a54669bf2242697410' into kraken
* commit '
2c5c9bb89b539a1a97d093a54669bf2242697410':
Fix issue #
2580316: Contacts and Phone app not supporting landscape mode...
The Android Open Source Project [Thu, 8 Apr 2010 18:39:51 +0000 (11:39 -0700)]
am
727cec02: merge from open-source master
Merge commit '
727cec02daa66b5e984aff277185d503fabe5d51' into kraken
* commit '
727cec02daa66b5e984aff277185d503fabe5d51':
Fix reporting of window visibility in WindowManagerService.
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:29:23 +0000 (11:29 -0700)]
am
65369424: merge from open-source master
Merge commit '
65369424cbfbf165b4324bdcb6f138435462a196' into kraken
* commit '
65369424cbfbf165b4324bdcb6f138435462a196':
Add keycodes PageUp and PageDown
Scott Main [Thu, 8 Apr 2010 18:29:19 +0000 (11:29 -0700)]
am
6b04d5c7: am
4981863d: Merge "docs: revisions to the installLocation documentation" into froyo
Merge commit '
6b04d5c735df7fa05c705f979eff8821989ab73d' into kraken
* commit '
6b04d5c735df7fa05c705f979eff8821989ab73d':
docs: revisions to the installLocation documentation
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:12:57 +0000 (10:12 -0700)]
am
9e82d359: am
d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
Merge commit '
9e82d359bcc22d1acd2eae5d7d183168cdfbf761' into kraken
* commit '
9e82d359bcc22d1acd2eae5d7d183168cdfbf761':
Don't allow connection to profiles in TURNING_OFF state.
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:12:43 +0000 (09:12 -0700)]
am
1531d211: am
3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Merge commit '
1531d211249783bdfc3ded9323397f22a5f1fc34' into kraken
* commit '
1531d211249783bdfc3ded9323397f22a5f1fc34':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
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:35:53 +0000 (08:35 -0700)]
am
d06c435c: 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 bett
Merge commit '
d06c435c3f520ef2012fdd331dac76b1621a72e6' into kraken
* commit '
d06c435c3f520ef2012fdd331dac76b1621a72e6':
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: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:33:26 +0000 (06:33 -0700)]
am
6fec76a0: am
8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
Merge commit '
6fec76a081fd5976c3d7d0aa9616d5680ccb237f' into kraken
* commit '
6fec76a081fd5976c3d7d0aa9616d5680ccb237f':
Transparent alarm icons for lockscreen.
Daniel Sandler [Thu, 8 Apr 2010 13:33:23 +0000 (06:33 -0700)]
am
07023777: am
9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
Merge commit '
070237771e89bbf027ed85302df7a91fae0fa5c2' into kraken
* commit '
070237771e89bbf027ed85302df7a91fae0fa5c2':
Add emergency call button to PUK'd lockscreen.
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:42:46 +0000 (22:42 -0700)]
am
a327dbdd: am
ecb0e637: Fix issue #
2541849: System crash when an app with active notifications...
Merge commit '
a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken
* commit '
a327dbddccb002919b98bdfd7abd81619826a3b8':
Fix issue #
2541849: System crash when an app with active notifications...
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...
Wu-cheng Li [Thu, 8 Apr 2010 05:01:54 +0000 (22:01 -0700)]
am
75a9cbae: am
3f4639a6: Update API and javadoc according to API review.
Merge commit '
75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken
* commit '
75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
Update API and javadoc according to API review.
Wu-cheng Li [Thu, 8 Apr 2010 04:58:21 +0000 (21:58 -0700)]
am
3f4639a6: Update API and javadoc according to API review.
Merge commit '
3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp
* commit '
3f4639a6611222ae1ae5493de49213250d292139':
Update API and javadoc according to API review.
Suchi Amalapurapu [Thu, 8 Apr 2010 04:32:30 +0000 (21:32 -0700)]
am
a599469f: am
c2461be6: Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Merge commit '
a599469f9095532cac95a8e7600412f156b88f1c' into kraken
* commit '
a599469f9095532cac95a8e7600412f156b88f1c':
Fix
2579461
Suchi Amalapurapu [Thu, 8 Apr 2010 04:29:05 +0000 (21:29 -0700)]
am
c2461be6: Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Merge commit '
c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp
* commit '
c2461be6279137f872becf695befeb7ba8770a64':
Fix
2579461
Suchi Amalapurapu [Thu, 8 Apr 2010 04:24:36 +0000 (21:24 -0700)]
Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Dianne Hackborn [Thu, 8 Apr 2010 02:13:22 +0000 (19:13 -0700)]
am
822a7e2d: am
ce59fb8b: Fix issue #
2578244: playing audio file downloaded by the browser...
Merge commit '
822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken
* commit '
822a7e2defcfbd006a7840e1da19cf0827d46736':
Fix issue #
2578244: playing audio file downloaded by the browser...
Dianne Hackborn [Thu, 8 Apr 2010 02:07:54 +0000 (19:07 -0700)]
am
ce59fb8b: Fix issue #
2578244: playing audio file downloaded by the browser...
Merge commit '
ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp
* commit '
ce59fb8b684357f2a10ab62368beeece34bc0e5d':
Fix issue #
2578244: playing audio file downloaded by the browser...
Grace Kloba [Thu, 8 Apr 2010 02:05:32 +0000 (19:05 -0700)]
am
520d6840: am
667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '
520d684093b50c25d06aac652ad4bca42ff7e862' into kraken
* commit '
520d684093b50c25d06aac652ad4bca42ff7e862':
Revert "Use the content width to calculate the zoom overview"
Grace Kloba [Thu, 8 Apr 2010 02:00:40 +0000 (19:00 -0700)]
am
667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '
667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp
* commit '
667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
Revert "Use the content width to calculate the zoom overview"
Grace Kloba [Thu, 8 Apr 2010 01:57:51 +0000 (18:57 -0700)]
Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Dianne Hackborn [Thu, 8 Apr 2010 01:57:33 +0000 (18:57 -0700)]
am
b37abe38: am
d3cc4967: Merge "Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Merge commit '
b37abe3867d582d68918d38f0684783f457543bb' into kraken
* commit '
b37abe3867d582d68918d38f0684783f457543bb':
Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app
Dianne Hackborn [Thu, 8 Apr 2010 01:41:42 +0000 (18:41 -0700)]
am
d3cc4967: Merge "Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Merge commit '
d3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp
* commit '
d3cc4967605e6c6b243a447d569fbb5b988a30ed':
Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app
Dianne Hackborn [Thu, 8 Apr 2010 01:37:12 +0000 (18:37 -0700)]
am
48879933: am
390022b2: Merge "Fix issue #
2528537: android.os.DeadObjectException" into froyo
Merge commit '
4887993381af1068cb0c68b4eca29ed83ebf47bd' into kraken
* commit '
4887993381af1068cb0c68b4eca29ed83ebf47bd':
Fix issue #
2528537: android.os.DeadObjectException
OSDN Git Service
