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

29709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
206bf9df48 am a5fe77d0: am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread 
Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc'

* commit 'a5fe77d004091bd9521d087c2572f587191afbfc':
  Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
 2010-08-27 18:10:01 -07:00
Wu-cheng Li
7fe6d3f13a am 705c2e66: am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'

* commit '705c2e66dcb358c865cf912a5496825088044b79':
  Unhide camera fps range API and deprecate old ones.
 2010-08-27 18:09:48 -07:00
Mathias Agopian
bf88d55b9f am e481f19c: am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into gingerbread 
Merge commit 'e481f19cf0898ef23423ced82dfaade00faeca9a'

* commit 'e481f19cf0898ef23423ced82dfaade00faeca9a':
  cleanup EGL a bit. remove unused extension.
 2010-08-27 18:09:43 -07:00
James Dong
c6ff7a9189 am 7d3ff384: am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 
Merge commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7'

* commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7':
  Suppress the video recording start signal
 2010-08-27 18:09:37 -07:00
Andreas Huber
8abd4256f3 am 05c1cada: am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread 
Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'

* commit '05c1cadaeaf272a70acc889bfccd607648058470':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
 2010-08-27 18:09:31 -07:00
Andreas Huber
84ecebb922 am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'

* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
  We accidentally always aborted after 10 secs, even if the connection was fine.
 2010-08-27 18:09:21 -07:00
Kenny Root
1c8082b205 resolved conflicts for merge of 053d5ce9 to master 
Change-Id: I910bb7795d987a2d11bc2e4e24f5992a269066cc
 2010-08-27 18:03:15 -07:00
Robert Greenwalt
fc40701c8b Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00
Romain Guy
9841ae8245 Merge "Add test for gamma correction." 2010-08-27 16:56:24 -07:00
Romain Guy
4299c0f242 Add test for gamma correction. 
Change-Id: Id2a311bc116438d3627a943cb5fb1ba8dc121bb0
 2010-08-27 16:56:50 -07:00
Daniel Lehmann
fff98cd16b Merge "Perform a float division for screenTravelCount" 2010-08-27 16:45:49 -07:00
Daniel Lehmann
4ef1da3c04 Perform a float division for screenTravelCount 
Change-Id: Ie0f23344a26c7ecf1a641e60d649ad0fc54fecbf
 2010-08-27 16:40:59 -07:00
Jim Miller
9a96e96208 Merge "Fix 2797185: Show 3D Recents on xlarge device" 2010-08-27 16:38:11 -07:00
Kenny Root
7a97e5a21e am 8e724905: am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread 
Merge commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d'

* commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d':
  Add debugging to ZipFileRO
 2010-08-27 16:18:44 -07:00
Gilles Debunne
71eaac0880 am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread 
Merge commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85'

* commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85':
  Broken build. Missing ;
 2010-08-27 16:18:37 -07:00
Gilles Debunne
2b9e4229a2 am aeaf2830: (-s ours) am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 
Merge commit 'aeaf2830f5ab81e6f95062514239081af65a914f'

* commit 'aeaf2830f5ab81e6f95062514239081af65a914f':
  DO NOT MERGE Removed "Stop selecting text" option.
 2010-08-27 16:18:31 -07:00
Brad Fitzpatrick
a222510af8 am 2479097e: am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 
Merge commit '2479097ecb899f1e193063e3ce126c721e13c455'

* commit '2479097ecb899f1e193063e3ce126c721e13c455':
  Document blocking behavior of ImageView setImageURI and setImageResource
 2010-08-27 16:18:24 -07:00
Mathias Agopian
54c4bf2743 am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread 
Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8'

* commit 'd322d16323176ddd5fef3383798176f64d0078c8':
  fix a race in SF buffer management
 2010-08-27 16:18:12 -07:00
Brad Fitzpatrick
4dcea37d48 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146'

* commit 'e339c0968e781f28e0c690afc746ea3d16aba146':
  Fix closing tag in docs.
 2010-08-27 16:18:03 -07:00
Brad Fitzpatrick
505735b1cc Merge "resolved conflicts for merge of 28130bae to master" 2010-08-27 16:12:57 -07:00
Mathias Agopian
1ec505668b Merge "Add KHR_gl_texture_2D_image extension string." 2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
7f7ce40f90 resolved conflicts for merge of 28130bae to master 
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
 2010-08-27 16:11:27 -07:00
Mathias Agopian
b20a4b960e Add KHR_gl_texture_2D_image extension string. 2010-08-27 16:08:03 -07:00
Gilles Debunne
6ff0dc0ad9 am dfad4276: (-s ours) am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 
Merge commit 'dfad42760f3c9c3b8439ff4b365256474471abe4'

* commit 'dfad42760f3c9c3b8439ff4b365256474471abe4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
 2010-08-27 16:06:22 -07:00
Gilles Debunne
a16fb779d5 am 084dd872: am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread 
Merge commit '084dd872b1bf9f7de87554d40d89df1f30b11c45'

* commit '084dd872b1bf9f7de87554d40d89df1f30b11c45':
  Fix for 512 limit in assetManager.list
 2010-08-27 16:06:13 -07:00
Cary Clark
2af36856e1 am 04108437: (-s ours) am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread 
Merge commit '04108437eda79fc2bad1eb2adf5247c9f4dbc480'

* commit '04108437eda79fc2bad1eb2adf5247c9f4dbc480':
  DO NOT MERGE copy selected text on tap
 2010-08-27 16:05:23 -07:00
Brad Fitzpatrick
c026d5cf2f am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 
Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'

* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
  Fix some bugs in SettingsProvider that I introduced the other day.
 2010-08-27 15:52:56 -07:00
Eric Rowe
bfa6d1dbe4 am aed5d62a: am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo 
Merge commit 'aed5d62ac1278c032528921798529dbd824a1865'

* commit 'aed5d62ac1278c032528921798529dbd824a1865':
  Improve logging and flexibility of BT stress tests.
 2010-08-27 15:52:33 -07:00
Dianne Hackborn
8e3d2382db Merge "Fix some SDK build breakage. Not all." 2010-08-27 15:42:19 -07:00
Dianne Hackborn
f6d952bbc8 Fix some SDK build breakage. Not all. 
Change-Id: I2791b0a7c48d03cb6e5ca93771efb56c0a0c1956
 2010-08-27 15:41:13 -07:00
Mathias Agopian
df25b0ec94 Merge "cleanup EGL a bit. remove unused extension." 2010-08-27 15:31:19 -07:00
Mathias Agopian
9d75f13415 cleanup EGL a bit. remove unused extension. 
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
 2010-08-27 15:30:16 -07:00
Sascha Brawer
d5426d7f61 Merge "Added default map boundaries for locale rm-CH. Cloned from values-de-rCH/arrays.xml." 2010-08-27 14:37:19 -07:00
James Dong
a5fe77d004 am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread 
Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp

* commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad':
  Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
 2010-08-27 14:36:02 -07:00
James Dong
df8356ff9a Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread 2010-08-27 14:33:54 -07:00
Wu-cheng Li
705c2e66dc am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp

* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
  Unhide camera fps range API and deprecate old ones.
 2010-08-27 14:22:21 -07:00
Wu-cheng Li
d851e6fea5 Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 2010-08-27 14:20:51 -07:00
Wu-cheng Li
5f1e69c76e Unhide camera fps range API and deprecate old ones. 
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
 2010-08-27 14:19:32 -07:00
Mathias Agopian
e481f19cf0 am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into gingerbread 
Merge commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f' into gingerbread-plus-aosp

* commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f':
  cleanup EGL a bit. remove unused extension.
 2010-08-27 14:17:00 -07:00
Mathias Agopian
ff3dcf27be Merge "cleanup EGL a bit. remove unused extension." into gingerbread 2010-08-27 14:14:46 -07:00
James Dong
90862e2a8b Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder 
is occasionally too small.

bug - 2882917

Change-Id: Id59d8529084c5689a26f272e0cd3b1e955fd8a30
 2010-08-27 13:59:26 -07:00
James Dong
7d3ff3849c am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 
Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp

* commit 'b86365ad74a197f2af6d70eedeb19083e31a9686':
  Suppress the video recording start signal
 2010-08-27 13:48:48 -07:00
Nipun Kwatra
cf66e47ddd Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
James Dong
b86365ad74 Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 2010-08-27 13:47:06 -07:00
Nipun Kwatra
f83cba77b6 Added MediaSourceSplitter to split single source to multiple ones. 
MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.

Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
 2010-08-27 13:46:41 -07:00
Andreas Huber
05c1cadaea am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread 
Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp

* commit '577615c98e390f8417e07844d04304eac5b0e911':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
 2010-08-27 13:46:19 -07:00
Andreas Huber
e25e03612e am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
  We accidentally always aborted after 10 secs, even if the connection was fine.
 2010-08-27 13:46:14 -07:00
Andreas Huber
577615c98e Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread 2010-08-27 13:44:14 -07:00
Andreas Huber
e250c220d1 Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 2010-08-27 13:44:07 -07:00
Andreas Huber
eeb97d91b9 Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long. 
Change-Id: Id491541a6ae501604cda815f8e961a3bfe26db7d
related-to-bug: 2556656
 2010-08-27 13:29:08 -07:00