Commit Graph

14976 Commits

Author SHA1 Message Date
Irfan Sheriff
e21b77fcbe am eaec9f2e: am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins 2010-04-09 08:51:19 -07:00
Eric Laurent
376f728b35 Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-04-09 08:48:32 -07:00
Andreas Huber
b7ad6287b0 am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:15:09 -07:00
Andreas Huber
2cc6a9c84b 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.
2010-04-09 07:09:49 -07:00
Andreas Huber
df649dcf20 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.
2010-04-09 07:06:11 -07:00
Andreas Huber
248281006b Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:01:58 -07:00
Patrick Scott
8788555ac7 am 8999c46c: am 54c5330f: am da9a22bc: Save/restore the picture in a background thread. 2010-04-09 06:47:56 -07:00
Patrick Scott
f5948633ea 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.
2010-04-09 06:43:47 -07:00
Patrick Scott
433ec61862 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.
2010-04-09 06:37:11 -07:00
Eric Laurent
775fa3cd32 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
2010-04-09 06:11:48 -07:00
Dan Egnor
8519cc849f am 5b4cc93b: am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 2010-04-08 23:12:43 -07:00
Dan Egnor
91612881f2 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().
2010-04-08 23:08:56 -07:00
Dan Egnor
cffaf6881e 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().
2010-04-08 23:04:16 -07:00
Dan Egnor
7b9c210b2e am d069fc9a: am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 22:54:34 -07:00
Xavier Ducrohet
c6b03835e7 am f31e4abd: am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 22:54:29 -07:00
Jeff Brown
91d987e302 am 6883c176: am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 22:54:25 -07:00
Dan Egnor
c8396d5200 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.
2010-04-08 22:50:50 -07:00
Xavier Ducrohet
43c201af0d 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.
2010-04-08 22:50:46 -07:00
Jeff Brown
32d531269b 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.
2010-04-08 22:50:42 -07:00
Dan Egnor
4672704eaa 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.
2010-04-08 22:39:27 -07:00
Xavier Ducrohet
be819eed47 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.
2010-04-08 22:39:24 -07:00
Jeff Brown
16c8a3671d 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.
2010-04-08 22:39:19 -07:00
Mathias Agopian
20bd336228 am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-08 22:38:29 -07:00
Mathias Agopian
83e08455d9 Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-08 19:10:52 -07:00
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
Dan Egnor
35c1a2dc1f Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 17:38:28 -07:00
Dan Egnor
66424a44c5 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
2010-04-08 17:30:37 -07:00
Xavier Ducrohet
a540ed0064 Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 17:29:39 -07:00
Jeff Brown
7710cd4c35 Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 17:18:15 -07:00
Irfan Sheriff
c15936c730 am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins 2010-04-08 17:10:36 -07:00
Irfan Sheriff
9bd980ac67 am 750f3211: am c9b6851a: Throttling framework addins
Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken

* commit '750f32117b96a8af4fb03fae459a80f79a667fca':
  Throttling framework addins
2010-04-08 17:05:06 -07:00
Irfan Sheriff
aeae766c4c am c9b6851a: Throttling framework addins
Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp

* commit 'c9b6851af68bdc20c4903b16c344e9f116647219':
  Throttling framework addins
2010-04-08 17:01:59 -07:00
Jeff Brown
8b5f2b6d3f am 5a8a507c: am b059dc9c: am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo 2010-04-08 16:54:41 -07:00
Jeff Brown
dc8d2e319c am 51fb09d9: am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo 2010-04-08 16:54:37 -07:00
Brett Chabot
457b247072 am 19912d2f: am 3622d253: am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo 2010-04-08 16:54:32 -07:00
Jeff Brown
523a8089b1 am b059dc9c: am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo 2010-04-08 16:49:56 -07:00
Jeff Brown
aa27eba6e2 am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo 2010-04-08 16:49:52 -07:00
Brett Chabot
42436caa39 am 3622d253: am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo 2010-04-08 16:49:46 -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
86f9e11a58 am b2216375: am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:30:55 -07:00
Robert Greenwalt
4795d40777 am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:28:08 -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