ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,213 Commits 2 Branches 0 Tags 54 MiB
cb96bb6256
Commit Graph

20213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wu-cheng Li
edc5b61ed5 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
c69e454512 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
fde6fae49b 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
dd5d691e1c 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
7ac02bddad 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
075719164d resolved conflicts for merge of 053d5ce9 to master 
Change-Id: I910bb7795d987a2d11bc2e4e24f5992a269066cc
 2010-08-27 18:03:15 -07:00
Robert Greenwalt
51feff93dc Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00
Romain Guy
d5008d5c58 Merge "Add test for gamma correction." 2010-08-27 16:56:24 -07:00
Daniel Lehmann
a4adf36150 Merge "Perform a float division for screenTravelCount" 2010-08-27 16:45:49 -07:00
Kenny Root
98ed842f53 am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread 
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp

* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
  Allow native shared libraries in ASEC containers
 2010-08-27 16:45:45 -07:00
Brad Fitzpatrick
4d77225fc7 am 15665bb6: Add current.xml API file missing from I8f2b6b79. 
Merge commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53' into gingerbread-plus-aosp

* commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53':
  Add current.xml API file missing from I8f2b6b79.
 2010-08-27 16:43:28 -07:00
Kenny Root
8e7ee82097 Merge "Allow native shared libraries in ASEC containers" into gingerbread 2010-08-27 16:42:28 -07:00
Jim Miller
12520e1483 Merge "Fix 2797185: Show 3D Recents on xlarge device" 2010-08-27 16:38:11 -07:00
Kenny Root
b940c7e901 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
bb5d3b2148 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
95ab5b2b89 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
ceb9b82d0a 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
2ac5b0d6de 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
Dianne Hackborn
dc958e33e5 am 4f8c2f26: Fix docs build. 
Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp

* commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699':
  Fix docs build.
 2010-08-27 16:18:09 -07:00
Brad Fitzpatrick
6709621b5f 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
d8bff004ae Merge "resolved conflicts for merge of 28130bae to master" 2010-08-27 16:12:57 -07:00
Mathias Agopian
5072f60127 Merge "Add KHR_gl_texture_2D_image extension string." 2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
2079dac435 resolved conflicts for merge of 28130bae to master 
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
 2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
23fa7f2e0e am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread 
Merge commit '0c731f99b05630e16dce572ac206ab75c90891cd' into gingerbread-plus-aosp

* commit '0c731f99b05630e16dce572ac206ab75c90891cd':
  Send broadcast intent when configured location providers change.
 2010-08-27 16:10:06 -07:00
Mathias Agopian
8e4b5a3e6a Add KHR_gl_texture_2D_image extension string. 2010-08-27 16:08:03 -07:00
Gilles Debunne
b0a8d80513 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
8ec835f7b6 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
5b493c2f7b 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
729f4ca190 Merge "Send broadcast intent when configured location providers change." into gingerbread 2010-08-27 16:02:21 -07:00
Brad Fitzpatrick
d77a169b6d 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
d5ac19e793 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
8dd5a64d2c Merge "Fix some SDK build breakage. Not all." 2010-08-27 15:42:19 -07:00
Mathias Agopian
b54263ab73 Merge "cleanup EGL a bit. remove unused extension." 2010-08-27 15:31:19 -07:00
Mathias Agopian
27e2fac337 cleanup EGL a bit. remove unused extension. 
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
 2010-08-27 15:30:16 -07:00
Wu-cheng Li
f4d7089aad am 1620d118: Fix SDK build error. 
Merge commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12' into gingerbread-plus-aosp

* commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12':
  Fix SDK build error.
 2010-08-27 15:13:53 -07:00
Sascha Brawer
395aca11f9 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
53a63f9fb9 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
9ee52948b8 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
a138f21822 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
c60754900b Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 2010-08-27 14:20:51 -07:00
Mathias Agopian
1bd3674343 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
af4764d570 Merge "cleanup EGL a bit. remove unused extension." into gingerbread 2010-08-27 14:14:46 -07:00
James Dong
cd61febcbb 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
8f136d033c Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
James Dong
a75ced9ce6 Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 2010-08-27 13:47:06 -07:00
Andreas Huber
bc7d5958c8 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
56f602bc7d 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
1afe05eb1b 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
2c39c50ac0 Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 2010-08-27 13:44:07 -07:00
Mathias Agopian
10cab190ba cleanup EGL a bit. remove unused extension. 
Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
 2010-08-27 13:17:32 -07:00