drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,426 Commits 1 Branch 0 Tags
Commit Graph

23426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
ed34e9506f am d908822d: Merge "clean-up dead-code" into kraken 2010-05-26 22:21:47 -07:00
Mathias Agopian
d908822df0 Merge "clean-up dead-code" into kraken 2010-05-26 22:20:39 -07:00
Mathias Agopian
7d1508b854 clean-up dead-code 2010-05-26 22:19:19 -07:00
Mathias Agopian
521b8d5c71 am a950aa84: Merge "Make sure to use filtering while in fixed-size mode" into kraken 2010-05-26 22:12:55 -07:00
Mathias Agopian
a950aa8418 Merge "Make sure to use filtering while in fixed-size mode" into kraken 2010-05-26 22:11:03 -07:00
Mathias Agopian
9237703335 Make sure to use filtering while in fixed-size mode 2010-05-26 22:10:04 -07:00
Irfan Sheriff
35ba2de255 am 2ed40379: am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo 2010-05-26 21:39:39 -07:00
Irfan Sheriff
2ed4037901 am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo 
Merge commit '8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken

* commit '8316e875baee53b661d5af8fa843d97e51acbcf6':
  Fix null pointer exception
 2010-05-26 21:37:45 -07:00
Mathias Agopian
2a0f01ea07 am 7ca7eedb: Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken 2010-05-26 21:36:47 -07:00
Mathias Agopian
7ca7eedbae Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken 2010-05-26 21:34:52 -07:00
Irfan Sheriff
8316e875ba am b3f3caef: Merge "Fix null pointer exception" into froyo 
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp

* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
  Fix null pointer exception
 2010-05-26 21:34:52 -07:00
Irfan Sheriff
b3f3caef38 Merge "Fix null pointer exception" into froyo 2010-05-26 21:32:29 -07:00
Mathias Agopian
663baddda9 oopsie. forgot to displatch SET_BUFFERS_GEOMETRY 2010-05-26 21:31:09 -07:00
Dirk Dougherty
6b9b5e12a6 am 81662bc7: am f69fd4dd: am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo 2010-05-26 18:37:11 -07:00
Dirk Dougherty
81662bc76a am f69fd4dd: am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo 
Merge commit 'f69fd4dd481c10749a8651ab6c9cfda1dea68297' into kraken

* commit 'f69fd4dd481c10749a8651ab6c9cfda1dea68297':
  Doc change: Suggest min keysize of 2048 for keys.
 2010-05-26 18:35:22 -07:00
Dirk Dougherty
f69fd4dd48 am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo 
Merge commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp

* commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e':
  Doc change: Suggest min keysize of 2048 for keys.
 2010-05-26 18:33:05 -07:00
Dirk Dougherty
4273ce19bf Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo 2010-05-26 18:31:38 -07:00
Dirk Dougherty
0f3abfb5c0 Doc change: Suggest min keysize of 2048 for keys. 
Change-Id: I6dcfe9aa12338e4ad71db2e6812ce387a75c09f0
 2010-05-26 17:34:09 -07:00
Irfan Sheriff
7baec0fe4e Fix null pointer exception 
Bug: 2718857
Change-Id: I4b04284fd5b3a4881297fe15555e9f1ca91d73cb
 2010-05-26 17:16:47 -07:00
James Dong
9407fb8062 am 1090a29d: Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken 2010-05-26 17:02:45 -07:00
James Dong
1090a29d4e Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken 2010-05-26 17:01:16 -07:00
Dirk Dougherty
d459439fcb am b8ab347b: am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo 2010-05-26 16:54:46 -07:00
James Dong
aed15e7856 Avoid repeatedly allocating and freeing memory in CameraSource 
Change-Id: Ia3760820da0559e4e908dedae1f1df05f9a6a242
 2010-05-26 16:54:18 -07:00
Dirk Dougherty
b8ab347b30 am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo 
Merge commit '81800015afe3ee397bc6b07e37fd6dc57e3a3b9b' into kraken

* commit '81800015afe3ee397bc6b07e37fd6dc57e3a3b9b':
  Doc change: fix adt download page, misc doc fixes.
 2010-05-26 16:53:04 -07:00
Dirk Dougherty
81800015af am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo 
Merge commit 'fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp

* commit 'fa499e46203dba2db2bb40f71e5af1650315c67c':
  Doc change: fix adt download page, misc doc fixes.
 2010-05-26 16:51:12 -07:00
Dirk Dougherty
fa499e4620 Merge "Doc change: fix adt download page, misc doc fixes." into froyo 2010-05-26 16:49:46 -07:00
Dirk Dougherty
75102d04bd Doc change: fix adt download page, misc doc fixes. 
Change-Id: Ifa04ea6f31cf0677bf95263188a137fd8dd721eb
 2010-05-26 16:37:48 -07:00
Andreas Huber
1c12511fda am a08d8523: Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken 2010-05-26 13:12:30 -07:00
Andreas Huber
a08d85237a Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken 2010-05-26 13:10:47 -07:00
Irfan Sheriff
8995192794 am 38417782: am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo 2010-05-26 13:07:38 -07:00
Irfan Sheriff
3841778298 am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo 
Merge commit 'c8390047bd2344032aca915816a8b91590835105' into kraken

* commit 'c8390047bd2344032aca915816a8b91590835105':
  Fix escaping of characters
 2010-05-26 13:05:53 -07:00
Irfan Sheriff
c8390047bd am 9ecca85f: Merge "Fix escaping of characters" into froyo 
Merge commit '9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp

* commit '9ecca85f0613032590c6840cae48b54f3d626181':
  Fix escaping of characters
 2010-05-26 13:04:11 -07:00
Irfan Sheriff
9ecca85f06 Merge "Fix escaping of characters" into froyo 2010-05-26 13:02:06 -07:00
Andreas Huber
eae953bfd4 Convert a number of assertions into runtime errors (OggExtractor) 
Change-Id: I8fcaec927d7b72e9d61cb7283e54523711980268
 2010-05-26 12:59:06 -07:00
Andreas Huber
e08d5ccfa0 am a581a776: Merge "Squashed commit of the following:" into kraken 2010-05-26 11:22:49 -07:00
Andreas Huber
a581a77640 Merge "Squashed commit of the following:" into kraken 2010-05-26 11:21:06 -07:00
Eric Laurent
83904eb5f7 am 27a308d3: Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-25 23:49:53 -07:00
Eric Laurent
27a308d309 Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-25 23:48:30 -07:00
Mathias Agopian
eaac276160 am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-25 17:57:08 -07:00
Mathias Agopian
64f7549b0e Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-25 17:56:07 -07:00
Mathias Agopian
2ce19af45b fix [2712278] The preview buffer left some black borders in left and bottom edges 
we were incorrectly flagging push_buffer surfaces as invalid

Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
 2010-05-25 17:51:34 -07:00
Yu Shan Emily Lau
393f5698a0 am f35ce7f8: am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:46:46 -07:00
Yu Shan Emily Lau
f35ce7f8ee am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 
Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken

* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
  Added the runtime parameters for the mediarecorder stress test.
 2010-05-25 17:44:46 -07:00
Yu Shan Emily Lau
6e0967b3c4 am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 
Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp

* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
  Added the runtime parameters for the mediarecorder stress test.
 2010-05-25 17:42:29 -07:00
Yu Shan Emily Lau
b0016e2b21 Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:40:51 -07:00
Jim Miller
14f56a0bd7 am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:14:50 -07:00
Jim Miller
b35cd7dde5 Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:13:18 -07:00
Jim Miller
bae698cd54 Fix 2667859: change text back to default size 
This reverts a change described in the above bug where
the font size got changed to 22dip.

Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939
 2010-05-25 16:53:45 -07:00
Yu Shan Emily Lau
48584d7b8f Added the runtime parameters for the mediarecorder stress test. 
Set the total number of the stress loops of camera preview memory test to 200.

Change-Id: I5a0278095155afd669ffee9bd599ddfffdcc42bf
 2010-05-25 16:42:57 -07:00
Robert Greenwalt
3cd6a3e353 am ac53a8a1: am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable 2010-05-25 16:17:23 -07:00