ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,351 Commits 2 Branches 0 Tags 54 MiB
4acba107d4
Commit Graph

18351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danica Chang
4acba107d4 Merge "deleted android_bluetooth_ScoSocket.cpp from makefile" 2010-07-20 13:55:18 -07:00
Eric Laurent
9f73c280be resolved conflicts for merge of dd206093 to master 
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
 2010-07-20 13:37:19 -07:00
Danica Chang
eb1275c1cc Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" 2010-07-20 12:47:45 -07:00
Nipun Kwatra
2576dfa9a7 Merge "Use software encoder for time lapse capture." 2010-07-20 12:33:11 -07:00
Adam Powell
d0f579e3c3 Merge "Action bar context mode support for overflow, submenus" 2010-07-20 12:15:08 -07:00
Eric Laurent
4efee95664 am 22a2d718: Merge "Audio policy manager changes for audio effects" into gingerbread 
Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp

* commit '22a2d7186d015efcd648dff99500f8467463be82':
  Audio policy manager changes for audio effects
 2010-07-20 11:28:26 -07:00
Eric Laurent
af1b8029d7 Merge "Audio policy manager changes for audio effects" into gingerbread 2010-07-20 11:25:35 -07:00
Nipun Kwatra
8c9af5a1b2 Merge "Adding support for timelapse capture using still camera's takepicture. Also moving entire implementation into a new class CameraSourceTimeLapse which inherits from CameraSource." 2010-07-20 11:04:49 -07:00
Alex Sakhartchouk
0677b232c3 Merge "Fixing potential buffer overrun errors." 2010-07-20 11:01:34 -07:00
Andreas Huber
8ecc7f04af am ff45709f: am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly. 
Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe'

* commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe':
  Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
 2010-07-20 10:46:12 -07:00
Andreas Huber
e4aad70d46 am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly. 
Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp

* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
  Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
 2010-07-20 10:40:39 -07:00
Jean-Baptiste Queru
a267dd05fe resolved conflicts for merge of ca48433a to master 
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
 2010-07-20 10:40:17 -07:00
The Android Open Source Project
61be2642e4 merge from open-source master 
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
 2010-07-20 10:33:38 -07:00
The Android Open Source Project
e2209d06ba am fcff6910: merge from open-source master 
Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'

* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
  typo fixed
 2010-07-20 10:28:35 -07:00
The Android Open Source Project
e38fb359a9 merge from open-source master 
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
 2010-07-20 10:25:37 -07:00
Chet Haase
3747c48ab8 Merge "Fix bugs in Sequencer" 2010-07-20 10:07:53 -07:00
Andreas Huber
88607d56ae 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
4a2f4622f9 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
c49422fba4 Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread 2010-07-20 09:18:58 -07:00
Mike Lockwood
0e26b504ec Merge "MTP host fixes:" 2010-07-20 09:06:41 -07:00
Shih-wei Liao
60d586752d Merge "Fix Android build" 2010-07-20 01:26:34 -07:00
Shih-wei Liao
ca0ecbc5b7 Merge "Change the include path." 2010-07-20 01:04:58 -07:00
Shih-wei Liao
7a980b626a Merge "Port ModelViewer to use the new build system. Fix the simulator build on Fountain." 2010-07-20 00:37:42 -07:00
Ying Wang
af8823fce7 Merge "Fix build" 2010-07-19 18:31:45 -07:00
Daniel Lehmann
277ed3b5af 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
ffa531b0ac Merge "Fix extraMath state variable." 2010-07-19 18:02:36 -07:00
Jack Palevich
3e9eb868b3 Fix extraMath state variable. 
Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
 2010-07-19 18:01:39 -07:00
Ying Wang
4947ad6cb9 Merge ".rs files are now built by the build system." 2010-07-19 17:53:01 -07:00
Jack Palevich
297ac296ed Merge "Try to handle end-of-application better." 2010-07-19 17:52:52 -07:00
Jack Palevich
92a9ae4a02 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
Jack Palevich
5203706a48 Merge "Write test timings to /sdcard/glperf.csv" 2010-07-19 17:40:46 -07:00
Jack Palevich
63bcb5f8e2 Write test timings to /sdcard/glperf.csv 
Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
 2010-07-19 17:39:52 -07:00
Jack Palevich
ea7b709cab Merge "Keep screen on for whole test." 2010-07-19 17:02:26 -07:00
Jack Palevich
965b95468d 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
a9c979ad8f 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
26dad22920 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
87449dbcc1 Merge "An application version of the GL test." 2010-07-19 16:28:56 -07:00
Jack Palevich
eb69d2ae19 An application version of the GL test. 
Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
 2010-07-19 16:27:54 -07:00
Mike Lockwood
a4cd7f43ba Merge "Add support for emulating external storage on devices with no SD card" 2010-07-19 16:09:40 -07:00
Jamie Gennis
ac07cd613f Remove some debug logging that I accidentally committed. 
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
 2010-07-19 16:09:26 -07:00
Winson Chung
d155c9acf2 Merge "Fixing build breakage due to misnamed javadoc variable." 2010-07-19 16:07:33 -07:00
Adam Powell
1e16c95049 Merge "Fix docs for MenuItem#setShowAsAction" 2010-07-19 15:52:02 -07:00
Adam Powell
423a9540ed Merge "Fix bug 2852909 - screen density for contextual action bar" 2010-07-19 15:48:53 -07:00
Jason Sams
29a926cded Merge "Threading RS ForEach." 2010-07-19 15:39:05 -07:00
Mason Tang
b081ca8b91 Merge "Added support for full-text search in Calendar" 2010-07-19 15:32:45 -07:00
Vasu Nori
9127755c43 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
Vasu Nori
0c7f4e5e81 am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
 2010-07-19 15:29:10 -07:00
Vasu Nori
9f63ea27d5 Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 2010-07-19 15:26:39 -07:00
The Android Open Source Project
10dd5ff7cf am 535f6f67: ignore from open-source master 
Merge commit '535f6f67ecfb16bbdc3d9adf8867e3c91be005fc'

* commit '535f6f67ecfb16bbdc3d9adf8867e3c91be005fc':
  Remove the window from being a target for motion events when it is destroyed.
 2010-07-19 15:22:40 -07:00
The Android Open Source Project
f0c6f6437d ignore from open-source master 
Change-Id: Id828527be6c49886f3e40cc2dbe61a5c9c965e71
 2010-07-19 15:19:44 -07:00