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

20261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wu-cheng Li
e3beff9332 am 6e46e6f7: am 7ec7b997: Remove camera metering mode API. 
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'

* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
  Remove camera metering mode API.
 2010-08-30 14:06:16 -07:00
Jean-Baptiste Queru
62cd9aa77c resolved conflicts for merge of ff749b9a to master 
Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af
 2010-08-30 14:00:27 -07:00
Wu-cheng Li
01a43af593 am 7ec7b997: Remove camera metering mode API. 
Merge commit '7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp

* commit '7ec7b9970cc3a6311bf043e228991adf24c43523':
  Remove camera metering mode API.
 2010-08-30 13:48:07 -07:00
Jean-Baptiste Queru
9ccfef93d7 am 9773cd73: (-s ours) am f470ed86: Merge "Support surrogate pairs when layouting text" 
Merge commit '9773cd73b627c8521257c005881554d183d19a63'

* commit '9773cd73b627c8521257c005881554d183d19a63':
  Support surrogate pairs when layouting text
 2010-08-30 13:47:37 -07:00
Joe Onorato
02a13a9f66 Merge "Add another pass of the docs that nothing depends on that tries to parse some of the docs but without generating all of them." 2010-08-30 13:34:55 -07:00
Andreas Huber
60bfaffe15 am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 
Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12'

* commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
 2010-08-30 13:30:35 -07:00
Eric Laurent
59f6934957 am 5762dc19: am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread 
Merge commit '5762dc19836e332d3ac1906e5698088a128b362d'

* commit '5762dc19836e332d3ac1906e5698088a128b362d':
  LVM release 1.07 delivery.
 2010-08-30 13:30:14 -07:00
Eric Rowe
a40376226b am 6151a9ef: (-s ours) am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 
Merge commit '6151a9ef232b9d4d2b38761159f49181679a6a17'

* commit '6151a9ef232b9d4d2b38761159f49181679a6a17':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
 2010-08-30 13:30:10 -07:00
Andreas Huber
fa639bc0d4 am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants. 
Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
  Finetune some rtsp timeout constants.
 2010-08-30 13:30:05 -07:00
Eric Fischer
1cb736c5e5 am a7dae24c: (-s ours) am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8'

* commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8':
  Import revised translations.  DO NOT MERGE
 2010-08-30 13:29:57 -07:00
Andreas Huber
86c75a5c23 am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 
Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'

* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
  ALoopers can now be named (useful to distinguish threads).
 2010-08-30 13:29:51 -07:00
Imre Sunyi
5e1bb4abfd am 1429f465: am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead 
Merge commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999'

* commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999':
  Shutdown when capacity is 0% and no charging or when battery is dead
 2010-08-30 13:28:16 -07:00
Jean-Baptiste Queru
8cdd4c6fcc am 55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data." 
Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp

* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
  Telephony: Control operator selection using EF_CSP data.
 2010-08-30 13:20:57 -07:00
Jean-Baptiste Queru
cceddb5964 am f470ed86: Merge "Support surrogate pairs when layouting text" 
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp

* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
  Support surrogate pairs when layouting text
 2010-08-30 13:20:41 -07:00
Andreas Huber
1a99837a81 am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 
Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
 2010-08-30 13:06:55 -07:00
Andreas Huber
ad40891c43 Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 2010-08-30 13:04:21 -07:00
Jean-Baptiste Queru
7cdfe1e440 Merge "Telephony: Control operator selection using EF_CSP data." 2010-08-30 13:00:48 -07:00
Eric Laurent
44e1255529 am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread 
Merge commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229' into gingerbread-plus-aosp

* commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229':
  LVM release 1.07 delivery.
 2010-08-30 12:33:56 -07:00
Eric Rowe
9f48359b26 am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 
Merge commit 'f72b0e447296bc07104af62c33c56bc15b7a6677' into gingerbread-plus-aosp

* commit 'f72b0e447296bc07104af62c33c56bc15b7a6677':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
 2010-08-30 12:33:52 -07:00
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