26995 Commits

Author SHA1 Message Date
Alex Sakhartchouk
1e37e875ef Fixing potential buffer overrun errors.
Change-Id: I77c43f0dd3a5d5a54465ff5d562f8e2b4d7fa3c3
2010-07-20 10:59:25 -07:00
Chet Haase
358af100ed Merge "Fix bugs in Sequencer" 2010-07-20 10:07:53 -07:00
Andreas Huber
3f15301c06 am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'

* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
2010-07-20 09:33:09 -07:00
Andreas Huber
4df3ab54eb am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp

* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
2010-07-20 09:24:53 -07:00
Andreas Huber
faf1d46a60 Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread 2010-07-20 09:18:58 -07:00
Mike Lockwood
30881f68c9 Merge "MTP host fixes:" 2010-07-20 09:06:41 -07:00
Mike Lockwood
3c51d6a9ef MTP host fixes:
Add support for detecting android MTP devices
Fix problem reading data packet with header sent separately from payload.

Change-Id: I07b34af6783ebe2e63a317796ba0c8223df86edf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 12:01:36 -04:00
Andy McFadden
aecf390618 Fix sim-eng build.
The LOCAL_PATH assignment was not available to the new host library
on simulator builds.

Change-Id: I7727f17ecc8f457f92bd6fa9ec13025dd8a56390
2010-07-20 08:18:43 -07:00
Mike Lockwood
108505b30f MTP: Remove race condition in initial device enumeration for host mode.
Change-Id: Iee01aaae3f8cca4234daa289bef6631da4d6c2b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 09:49:50 -04:00
Mike Lockwood
9bbc2ea9ad MTP: Fix problems reading and writing arrays in property values.
Change-Id: Idd53b63fd32698a3ffc90f174d16ae597b4feb36
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 09:49:50 -04:00
Mike Lockwood
bbd9f36efa MTP: add Linux host library for MTP/PTP host support.
Change-Id: Ie2ce60b957ee428a8e8db46a70c5a0ade8445007
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 09:49:50 -04:00
Shih-wei Liao
b1cd67bb48 Merge "Fix Android build" 2010-07-20 01:26:34 -07:00
Shih-wei Liao
57e7a95b16 Fix Android build
Change-Id: I531dec556e6774518d19707f91c99ecaaf344c0f
2010-07-20 01:25:10 -07:00
Shih-wei Liao
9d07ed1f5d Merge "Change the include path." 2010-07-20 01:04:58 -07:00
Shih-wei Liao
7152c05724 Change the include path.
Change-Id: I884f95e40ab2d7080fd1eec0ecc9b86794b7c042
2010-07-20 01:03:09 -07:00
Shih-wei Liao
c67dc1afba Merge "Port ModelViewer to use the new build system. Fix the simulator build on Fountain." 2010-07-20 00:37:42 -07:00
Shih-wei Liao
3485976e84 Port ModelViewer to use the new build system.
Fix the simulator build on Fountain.

Change-Id: I89b05c31595f0a8c3001171957eeeb2fec253c74
2010-07-20 00:36:47 -07:00
Ying Wang
6ddaacef9b Switch back to use the default search of include path
since slang has been fixed to add current dir as one of the default search path.

Change-Id: Id3e80955ce445f155fc518927974be7986daff1f
2010-07-19 19:05:31 -07:00
Romain Guy
c0ac193b94 Add support for linear gradients.
Change-Id: Id15329da065045b3f06fdaed615f33cd57608496
2010-07-19 18:44:05 -07:00
Ying Wang
9d339c13aa Merge "Fix build" 2010-07-19 18:31:45 -07:00
Ying Wang
bbe72dcda6 Fix build
Slang uses env var that build server does not set, so we still need to use relative path.

Change-Id: Ibf57710b113674fe546700d81154e5236920134c
2010-07-19 18:30:15 -07:00
Daniel Lehmann
47f79bb4c5 Merge "Replace try-catch code by proper type checking. Saves an exception for each blob." 2010-07-19 18:03:08 -07:00
Jack Palevich
3a18eb93da Merge "Fix extraMath state variable." 2010-07-19 18:02:36 -07:00
Jack Palevich
9610f635e8 Fix extraMath state variable.
Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
2010-07-19 18:01:39 -07:00
Daniel Lehmann
156add9575 Replace try-catch code by proper type checking. Saves an exception for each blob.
Change-Id: I208ed0acb754391bd44b52887792563e92b39011
2010-07-19 18:01:28 -07:00
Ying Wang
caaf428f47 Merge ".rs files are now built by the build system." 2010-07-19 17:53:01 -07:00
Jack Palevich
3c6f1b38b7 Merge "Try to handle end-of-application better." 2010-07-19 17:52:52 -07:00
Jack Palevich
81d7aeb89d Try to handle end-of-application better.
Handle rotation from portrait to landscape by restarting test if not
finished.

Don't write blank line to csv file.

Change-Id: I154443138817bcec9530123c8388fcf659632336
2010-07-19 17:52:12 -07:00
Chet Haase
010dbaa123 Fix bugs in Sequencer
Change-Id: I03aebe8d822bef0b9e163ba3280699ca02a6563c
2010-07-19 17:41:03 -07:00
Jack Palevich
621fa795a9 Merge "Write test timings to /sdcard/glperf.csv" 2010-07-19 17:40:46 -07:00
Jack Palevich
5a52b1ce2b Write test timings to /sdcard/glperf.csv
Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
2010-07-19 17:39:52 -07:00
Jack Palevich
e23beed032 Merge "Keep screen on for whole test." 2010-07-19 17:02:26 -07:00
Jack Palevich
9778f9fc0e Keep screen on for whole test.
Print only one set of timings per test.

Draw blank black screen when done.

Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
2010-07-19 17:01:25 -07:00
Jamie Gennis
39c186dd91 am 98f8e0cb: am ff7049ab: Remove some debug logging that I accidentally committed.
Merge commit '98f8e0cbaa19b4a045e6f201290e731ddfad67ba'

* commit '98f8e0cbaa19b4a045e6f201290e731ddfad67ba':
  Remove some debug logging that I accidentally committed.
2010-07-19 16:35:26 -07:00
Jamie Gennis
98f8e0cbaa am ff7049ab: Remove some debug logging that I accidentally committed.
Merge commit 'ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp

* commit 'ff7049ab2886acc73e145367118646f7741ce333':
  Remove some debug logging that I accidentally committed.
2010-07-19 16:33:11 -07:00
Jack Palevich
9e3d49046e Merge "An application version of the GL test." 2010-07-19 16:28:56 -07:00
Jack Palevich
c954115596 An application version of the GL test.
Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
2010-07-19 16:27:54 -07:00
Mike Lockwood
2ef1cea440 Merge "Add support for emulating external storage on devices with no SD card" 2010-07-19 16:09:40 -07:00
Jamie Gennis
ff7049ab28 Remove some debug logging that I accidentally committed.
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
2010-07-19 16:09:26 -07:00
Winson Chung
121d7d86d2 Merge "Fixing build breakage due to misnamed javadoc variable." 2010-07-19 16:07:33 -07:00
Winson Chung
95362595ed Fixing build breakage due to misnamed javadoc variable.
Change-Id: I883a53107d2c0fcd4544c85811aeaad3fc4f13c2
2010-07-19 16:05:50 -07:00
Ying Wang
bc8112fd6d .rs files are now built by the build system.
Change-Id: Iba28bed6cc05883a28a59b8dd0ff12e1bfbe0c04
2010-07-19 16:01:44 -07:00
Adam Powell
16ba106de5 Merge "Fix docs for MenuItem#setShowAsAction" 2010-07-19 15:52:02 -07:00
Adam Powell
ec66a3a9e0 Fix docs for MenuItem#setShowAsAction
Change-Id: Id68273dde9c0ce904bca7b40aa2e9558880c55c2
2010-07-19 15:51:17 -07:00
Adam Powell
3b1f1bce1c Merge "Fix bug 2852909 - screen density for contextual action bar" 2010-07-19 15:48:53 -07:00
Adam Powell
dcdefbbff2 Fix bug 2852909 - screen density for contextual action bar
Change-Id: I9e3d8fe4e6f5eb0282cc103a98ed60ca2911c91e
2010-07-19 15:46:48 -07:00
Jason Sams
6e738552ea Merge "Threading RS ForEach." 2010-07-19 15:39:05 -07:00
Jason Sams
8e6c17fcc4 Threading RS ForEach.
Change-Id: I5d6fe4db2b6ac0613394bc5a066ff90ec146d60e
2010-07-19 15:38:19 -07:00
Mason Tang
f9c4bdb739 Merge "Added support for full-text search in Calendar" 2010-07-19 15:32:45 -07:00
Vasu Nori
fddc0858f2 am 3766ed3e: am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit '3766ed3eed6be0a9e78193166bab64bf25f02e81'

* commit '3766ed3eed6be0a9e78193166bab64bf25f02e81':
  fix javadoc error which breaks SDK build in gingerbread
2010-07-19 15:32:10 -07:00