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

45432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
ca20af0c29 Merge "Clean up use of HAVE_ANDROID_OS" 2011-02-16 12:33:28 -08:00
James Dong
8ec313e4fa Merge "Change the media player stress test to repor the total number of failure and the total number of info. Register the surface callback in the test application bug# 2909064" 2011-02-16 12:27:08 -08:00
Yu Shan Emily Lau
85305f04d5 Change the media player stress test to repor the total number of failure and the total number of info. 
Register the surface callback in the test application bug# 2909064

Change-Id: I3420b5bc81e276b50f612c126ed5fc1f4f16c08c
 2011-02-16 12:24:34 -08:00
Andy Stadler
b84133740a am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb 
* commit '04ddff6905a72d0d39d791eaba33546fb66b15a6':
  @hide DPM global proxy settings
 2011-02-16 12:22:57 -08:00
Andy Stadler
04ddff6905 am b1835085: Merge "@hide DPM global proxy settings" into honeycomb 
* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
  @hide DPM global proxy settings
 2011-02-16 12:20:36 -08:00
Andy Stadler
b183508516 Merge "@hide DPM global proxy settings" into honeycomb 2011-02-16 12:18:39 -08:00
Scott Main
d5444802b7 am 153cebee: resolved conflicts for merge of f722cecd to honeycomb-plus-aosp 
* commit '153cebee2432a931773130bffa20e72a982c0107':
  docs: update homepage for 3.0 announcement
 2011-02-16 12:11:11 -08:00
Scott Main
153cebee24 resolved conflicts for merge of f722cecd to honeycomb-plus-aosp 
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
 2011-02-16 12:08:36 -08:00
Dmitri Plotnikov
9480efeff7 Setting copiedSize to 0 when value is null 
Bug: 3457998
Change-Id: I01f6d02e76884639600c679518c5817ce73e0f23
 2011-02-16 12:03:10 -08:00
Scott Main
f722cecd18 Merge "docs: update homepage for 3.0 announcement" into honeycomb 2011-02-16 11:58:40 -08:00
Scott Main
7fbeaf9286 docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools 
Change-Id: I6021cd0eb9d37a004036249305819a352efa4f92
 2011-02-16 11:55:10 -08:00
Daniel Sandler
439f5c6b39 Merge "Fix NPE." 2011-02-16 11:32:39 -08:00
James Dong
d33a4ccb5c Decouple AudioRecord read and audio encoding 
bug - 3313754

Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
 2011-02-16 11:23:21 -08:00
Robert Greenwalt
5a5b4ba9fe am 271397cf: (-s ours) am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit '271397cfb2b79d1346568209b37b1f57707f924a':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:58:34 -08:00
Kenny Root
bb9d394b21 Clean up use of HAVE_ANDROID_OS 
HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches
all the other uses of HAVE_ANDROID_OS throughout the system.

Change-Id: I82257325a8ae5e4e4371ddfc4dbf51cea8ea0abb
 2011-02-16 10:56:32 -08:00
Robert Greenwalt
271397cfb2 am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit 'de27b519588ed46c0ba601a489c01d26ec31757d':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:55:54 -08:00
Andy Stadler
d26727273d @hide DPM global proxy settings 
They don't work as advertised, so remove from SDK.

Bug: 3460938

Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
 2011-02-16 10:53:33 -08:00
Robert Greenwalt
de27b51958 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:51:04 -08:00
Fabrice Di Meglio
8761bfaa8d Merge "Code cleaning" 2011-02-16 10:48:12 -08:00
Robert Greenwalt
3259d88537 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -08:00
Eric Fischer
da9a17019e am aebe3dfe: (-s ours) am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'aebe3dfe61ba889962174cf9e24783770af31e02':
  Import revised translations.  DO NOT MERGE
 2011-02-16 10:41:59 -08:00
Shimeng (Simon) Wang
96b065f001 Remember zoom overview state since the postscale callback is async. 
issue: 3451476
Change-Id: I56eaeff4e35f8a791b990fcdd1188ca6cdef601a
 2011-02-16 10:38:21 -08:00
Eric Fischer
aebe3dfe61 am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
  Import revised translations.  DO NOT MERGE
 2011-02-16 10:38:11 -08:00
Robert Greenwalt
8e9abc5b2e Fix wifi watchdog to use InetAddress 
Supports IPv6 and stops using deprectated DhcpInfo.

Change-Id: I0590dbcd50f56e15d9b95327ad9435cdbfc8a78d
 2011-02-16 10:37:50 -08:00
Eric Fischer
874ae43ce1 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-16 10:33:18 -08:00
Alon Albert
1bad83adf0 Rename method to discourage use of this in favor of member field 
Change-Id: Ie2d1e17e8879ad0f11fe815001fefccdd6603936
 2011-02-16 10:29:56 -08:00
Alon Albert
4308735055 am 2d314d12: (-s ours) am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit '2d314d1282067518bcd34015f629c5d3e6ff15a1':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:28:51 -08:00
Alon Albert
2d314d1282 am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:26:53 -08:00
Scott Main
739b35fff4 am 415ef50d: am 796ce77a: docs: add breadcrumbs to articles and tutorials 
* commit '415ef50d902dddfe974f3a280733ae3769931143':
  docs: add breadcrumbs to articles and tutorials
 2011-02-16 10:25:29 -08:00
Alon Albert
b79db4cd5c am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:24:15 -08:00
Scott Main
415ef50d90 am 796ce77a: docs: add breadcrumbs to articles and tutorials 
* commit '796ce77abf3d1d006576490c286e72ebf0736280':
  docs: add breadcrumbs to articles and tutorials
 2011-02-16 10:23:05 -08:00
Alon Albert
d1c3fe022e Merge "Bring back auto clear backoff on reconnect Also, make sure it works this time by calling onBackoffChanged()" 2011-02-16 10:20:40 -08:00
Alon Albert
be5f82ab0d Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
Eric Fischer
abe92da72f Import revised translations. DO NOT MERGE 
Change-Id: Id7d999bfc9d422292aa81d5a8c579840e9cc1438
 2011-02-16 10:18:37 -08:00
Alon Albert
ed1d253573 Bring back auto clear backoff on reconnect 
Also, make sure it works this time by calling onBackoffChanged()

Bug: 3460736
Change-Id: I0470d6cb0aabd798dab4116d5d135c7a2364ed28
 2011-02-16 10:17:49 -08:00
Alon Albert
c441e4e355 DO NOT MERGE - Clear backoffs on reconnect 
Slightly modified backport from HC

Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
 2011-02-16 10:16:33 -08:00
Andreas Huber
9497144281 Merge "Remove legacy, AwesomePlayer-based http live implementation." 2011-02-16 10:12:11 -08:00
Scott Main
796ce77abf docs: add breadcrumbs to articles and tutorials 
Change-Id: If49368853e95d39bbe6b42c6fc3820a8a7319048
 2011-02-16 10:04:45 -08:00
daniel_tomas
675a6527a5 am 54f9be2a: am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '54f9be2a265a0e06bb7f6c50acf674f47b8fe18a':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:45:41 -08:00
daniel_tomas
54f9be2a26 am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:43:08 -08:00
daniel_tomas
99e267ebcf am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:41:00 -08:00
Shimeng (Simon) Wang
0f7c903aa1 Merge "Fit to screen for the first new picture with enough different width." 2011-02-16 09:28:16 -08:00
Nick Pelly
ef12256ca5 am d8d51fed: am 8c8e9d9a: am 1df862a4: Minor doc update. 
* commit 'd8d51fed861cd36f57f1eb2542def23322379d7c':
  Minor doc update.
 2011-02-16 09:27:37 -08:00
daniel_tomas
7bcd2c62eb New API added in NfcAdapter to enable/disable SE card emulation 
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
 2011-02-16 09:27:25 -08:00
Scott Main
3e98093c59 am 9fb2b136: am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb 
* commit '9fb2b13600a7192031d37cd41525eacb736bcf11':
  docs: edit doc titles to match side nav and add breadcrumb links
 2011-02-16 09:25:29 -08:00
Nick Pelly
d8d51fed86 am 8c8e9d9a: am 1df862a4: Minor doc update. 
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
  Minor doc update.
 2011-02-16 09:25:09 -08:00
Andreas Huber
65e53c664f am 0bbf9667: (-s ours) am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 
* commit '0bbf96675783758b6ffdff8996d7166ae1dec15b':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
 2011-02-16 09:23:11 -08:00
Nick Pelly
8c8e9d9a7f am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Scott Main
9fb2b13600 am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb 
* commit 'f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
  docs: edit doc titles to match side nav and add breadcrumb links
 2011-02-16 09:21:06 -08:00
Andreas Huber
d6c421f1a0 Remove legacy, AwesomePlayer-based http live implementation. 
Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
 2011-02-16 09:19:40 -08:00