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

20192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
f64441add6 am f6639c46: Finetune some rtsp timeout constants. 
Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp

* commit 'f6639c46e83a1ccab7b293192c208091d17c61be':
  Finetune some rtsp timeout constants.
 2010-08-30 12:33:25 -07:00
Eric Fischer
cb14ea46dc am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8' into gingerbread-plus-aosp

* commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8':
  Import revised translations.  DO NOT MERGE
 2010-08-30 12:33:19 -07:00
Andreas Huber
d75a5fa55c am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp

* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
  ALoopers can now be named (useful to distinguish threads).
 2010-08-30 12:33:08 -07:00
Daisuke Miyakawa
0affb74515 Merge "Fix NPE when Spinner is reused." 2010-08-30 12:22:47 -07:00
Eric Laurent
6a8099f637 Merge "LVM release 1.07 delivery." into gingerbread 2010-08-30 11:39:34 -07:00
Eric Rowe
9838cb73ab Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 2010-08-30 11:37:10 -07:00
Alex Sakhartchouk
3d3c6839c1 Merge "Fixing renderscript uniform binding bugs. Working on custom shaders." 2010-08-30 10:39:46 -07:00
Imre Sunyi
b1936cb31b am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead 
Merge commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf' into gingerbread-plus-aosp

* commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf':
  Shutdown when capacity is 0% and no charging or when battery is dead
 2010-08-30 10:33:35 -07:00
Eric Fischer
4cb6dd8679 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-30 10:28:58 -07:00
Andreas Huber
617fa2df06 Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 2010-08-30 10:28:24 -07:00
Jean-Baptiste Queru
46c9ed2621 Merge "Support surrogate pairs when layouting text" 2010-08-30 09:15:42 -07:00
Mike Lockwood
375442d54d Merge "MTP: Add try/finally handling to finalize overrides" 2010-08-30 08:59:21 -07:00
Derek Sollenberger
42becd44aa am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4'

* commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:34:23 -07:00
Derek Sollenberger
3967e9d817 am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp

* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:06:36 -07:00
Derek Sollenberger
bdedbf0713 Merge "Support pre-loading browser plugins on the system image." into gingerbread 2010-08-30 07:31:46 -07:00
Joe Malin
8adf99913a Merge "Testing Documentation in the Dev Guide tab" 2010-08-28 10:04:20 -07:00
Daniel Sandler
455247c379 am 02b19843: am 27cf4ad8: Fix build. 
Merge commit '02b19843d4fb28103cc4b21aa2017eeca795d87d'

* commit '02b19843d4fb28103cc4b21aa2017eeca795d87d':
  Fix build.
 2010-08-27 20:42:11 -07:00
Daniel Sandler
db9d522db3 am 27cf4ad8: Fix build. 
Merge commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888' into gingerbread-plus-aosp

* commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888':
  Fix build.
 2010-08-27 20:39:39 -07:00
Daniel Sandler
36439cd492 am 554d8726: (-s ours) am 0776deff: More obsolete status bar bits. DO NOT MERGE 
Merge commit '554d8726f8df053c07e0c68e43f060019c11264e'

* commit '554d8726f8df053c07e0c68e43f060019c11264e':
  More obsolete status bar bits. DO NOT MERGE
 2010-08-27 20:03:18 -07:00
Daniel Sandler
cb9a157689 am 44af754c: (-s ours) am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE 
Merge commit '44af754cf0c9ad9a8162e1bd2af60737e81a8beb'

* commit '44af754cf0c9ad9a8162e1bd2af60737e81a8beb':
  Remove experimental immersive mode support. DO NOT MERGE
 2010-08-27 20:03:14 -07:00
Daniel Sandler
158d896843 am 0776deff: More obsolete status bar bits. DO NOT MERGE 
Merge commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5' into gingerbread-plus-aosp

* commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5':
  More obsolete status bar bits. DO NOT MERGE
 2010-08-27 20:00:40 -07:00
Daniel Sandler
14e5bb5d38 am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE 
Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp

* commit 'd02bdaab495641ab50e2123fdfd99a819cc40540':
  Remove experimental immersive mode support. DO NOT MERGE
 2010-08-27 20:00:29 -07:00
Nipun Kwatra
7539f60c94 Merge "client_id->clientId, bugfix for signaling of read abort on stop." 2010-08-27 18:21:30 -07:00
Kenny Root
d8362e001f am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread 
Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74'

* commit '8328578152fbfd23952a6cda4b2e60853d78eb74':
  Allow native shared libraries in ASEC containers
 2010-08-27 18:11:06 -07:00
Brad Fitzpatrick
74af54f142 am 63b5b870: am 15665bb6: Add current.xml API file missing from I8f2b6b79. 
Merge commit '63b5b8701092de71e48b36cce8eb36f51f9d4d5e'

* commit '63b5b8701092de71e48b36cce8eb36f51f9d4d5e':
  Add current.xml API file missing from I8f2b6b79.
 2010-08-27 18:10:58 -07:00
Dianne Hackborn
e8c05f35ec am 8da20dd0: am 4f8c2f26: Fix docs build. 
Merge commit '8da20dd03797dcdc1f417fe9cebc21825551dd69'

* commit '8da20dd03797dcdc1f417fe9cebc21825551dd69':
  Fix docs build.
 2010-08-27 18:10:49 -07:00
Brad Fitzpatrick
2a6151f793 am d71021cb: am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread 
Merge commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3'

* commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3':
  Send broadcast intent when configured location providers change.
 2010-08-27 18:10:38 -07:00
Wu-cheng Li
02927ab67b am af610b2b: am 1620d118: Fix SDK build error. 
Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048'

* commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048':
  Fix SDK build error.
 2010-08-27 18:10:17 -07:00
James Dong
a97e9c6f65 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
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