Mathias Agopian
3a80695667
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
2010-04-08 19:09:04 -07:00
Jeff Brown
0e9befbf4b
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.
2010-04-08 16:47:19 -07:00
Jeff Brown
38f5d6454d
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.
2010-04-08 16:47:15 -07:00
Brett Chabot
c99332653f
am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo
...
Merge commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97' into kraken
* commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97':
IME test fixes.
2010-04-08 16:45:16 -07:00
Jeff Brown
5733ad453d
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.
2010-04-08 16:44:40 -07:00
Jeff Brown
68e2f85740
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.
2010-04-08 16:44:37 -07:00
Jeff Brown
62737b55d2
Merge "Workaround NPE caused by packages missing signatures." into froyo
2010-04-08 16:41:47 -07:00
Jeff Brown
20460cfc7d
Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:41:37 -07:00
Brett Chabot
5313fd997b
am 185f1a96: Merge "IME test fixes." into froyo
...
Merge commit '185f1a96683f59e2ff617b688449fd490e364be7' into froyo-plus-aosp
* commit '185f1a96683f59e2ff617b688449fd490e364be7':
IME test fixes.
2010-04-08 16:39:50 -07:00
Brett Chabot
399d2f06da
Merge "IME test fixes." into froyo
2010-04-08 16:36:02 -07:00
Robert Greenwalt
89aea51145
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
2010-04-08 16:25:54 -07:00
Robert Greenwalt
8a3b2cf4c8
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
2010-04-08 16:18:31 -07:00
Robert Greenwalt
8e1b0077ad
Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:09:31 -07:00
Dan Egnor
00e55cbf87
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.
2010-04-08 14:53:06 -07:00
Dan Egnor
02b338b7f2
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.
2010-04-08 14:48:50 -07:00
Dan Egnor
efdccf3ebb
Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:45:07 -07:00
Dan Egnor
1dbebb2627
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.
2010-04-08 14:19:52 -07:00
Dan Egnor
7f22a7ccd1
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.
2010-04-08 14:15:29 -07:00
Grace Kloba
187a98c25e
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
2010-04-08 14:12:58 -07:00
Dan Egnor
2728e5f544
Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:10:50 -07:00
Brad Fitzpatrick
e15bd8ec0c
am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken
* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
Rename logtag for clarity.
2010-04-08 14:08:56 -07:00
Grace Kloba
f11f1e8c89
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
2010-04-08 14:08:35 -07:00
Grace Kloba
b2a21d6ac3
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
2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
ab7954a0b0
am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp
* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
Rename logtag for clarity.
2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
b56b5fd4fc
Merge "Rename logtag for clarity." into froyo
2010-04-08 14:01:23 -07:00
Jeff Brown
23605c9bea
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
2010-04-08 13:51:48 -07:00
Jeff Brown
bd2c3a73d0
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
2010-04-08 13:49:55 -07:00
Andreas Huber
a7171fb1d7
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.
2010-04-08 12:49:41 -07:00
Robert Greenwalt
f4b6a4e7f3
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.
2010-04-08 12:49:38 -07:00
Andreas Huber
376f0c3ee6
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.
2010-04-08 12:45:59 -07:00
Robert Greenwalt
53b96a3c8e
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.
2010-04-08 12:45:51 -07:00
Andreas Huber
d85bfb3a14
Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 12:44:33 -07:00
Robert Greenwalt
98b863760c
Merge "Add service to monitor/control the flow of data." into froyo
2010-04-08 12:42:09 -07:00
Dianne Hackborn
809a225e3a
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...
2010-04-08 11:41:38 -07:00
The Android Open Source Project
76209e94ba
am 727cec02: merge from open-source master
...
Merge commit '727cec02daa66b5e984aff277185d503fabe5d51' into kraken
* commit '727cec02daa66b5e984aff277185d503fabe5d51':
Fix reporting of window visibility in WindowManagerService.
2010-04-08 11:39:51 -07:00
Dianne Hackborn
6286f57ea6
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...
2010-04-08 11:39:03 -07:00
The Android Open Source Project
d1f9f3e832
merge from open-source master
...
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
2010-04-08 11:35:37 -07:00
Dianne Hackborn
be4143d514
Merge "Fix issue #2580316 : Contacts and Phone app not supporting landscape mode..." into froyo
2010-04-08 11:35:27 -07:00
The Android Open Source Project
267e256808
am 65369424: merge from open-source master
...
Merge commit '65369424cbfbf165b4324bdcb6f138435462a196' into kraken
* commit '65369424cbfbf165b4324bdcb6f138435462a196':
Add keycodes PageUp and PageDown
2010-04-08 11:29:23 -07:00
Scott Main
f507149a6a
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
2010-04-08 11:29:19 -07:00
The Android Open Source Project
529973acc2
merge from open-source master
...
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
2010-04-08 11:27:55 -07:00
Scott Main
c01e716961
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
2010-04-08 11:25:36 -07:00
Scott Main
436aa0ff9c
Merge "docs: revisions to the installLocation documentation" into froyo
2010-04-08 11:22:42 -07:00
Jaikumar Ganesh
b9ceaf375b
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.
2010-04-08 10:12:57 -07:00
Jaikumar Ganesh
8d2ccb8b2d
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.
2010-04-08 10:08:25 -07:00
Jaikumar Ganesh
6b4e57141f
Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo
2010-04-08 10:01:50 -07:00
Andrei Popescu
1e082df4fa
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().
2010-04-08 09:12:43 -07:00
Andrei Popescu
d18e7e3d54
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().
2010-04-08 09:10:09 -07:00
Andrei Popescu
95ecb699b0
Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
2010-04-08 09:07:32 -07:00
Andreas Huber
07101b8df3
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.
2010-04-08 08:35:53 -07:00