summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature ↵Joe Fernandez2012-03-212-2/+5
|\ | | | | | | info)" into ics-mr1
| * docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)Joe Fernandez2012-03-212-2/+5
| | | | | | | | Change-Id: Id10c2d5eec9f81d1c6ce52067b7e25b7f411d91c
* | Fix 5960562: Show emergency button on PukUnlock screenJim Miller2012-03-201-1/+1
|/ | | | | | | | This fixes an issue where the device doesn't show the emergency button on the SIM PUK unlock screen. The problem was introduced in I3127bfd5 where we allowed the button to be conditionally shown. Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
* Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1Eric Laurent2012-03-191-1/+2
|\
| * audioflinger: fix issue with camcorder and A2DPEric Laurent2012-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some audio HALs do not support well a device selection of 0 (no device) received on an input stream. This can happen because of a problem in the audioflinger code that handles the forwarding of the output device selection to the record thread for use by the pre processing modules that need it. If the output device is 0 (meaning no op, which happens when stopping playback over A2DP) audioflinger could not detect it was an output device selection and would forward it to the input stream (see AudioFlinger::setParameters() and RecordThread::checkForNewParameters_l(). Issue 6179641. Change-Id: Idae534521866538e0d12ba259a2834f402a922e2
* | Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1Joe Fernandez2012-03-197-42/+273
|\ \
| * | docs: Android SDK r17 (RC6) Release NotesJoe Fernandez2012-03-167-42/+273
| | | | | | | | | | | | Change-Id: I1e58b3827e4fe70310d2154e0f85b16b79d6a0d2
* | | Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1Justin Ho2012-03-193-3/+3
|\ \ \
| * | | DO NOT MERGE Revert "Increase line limit for summary text"Justin Ho2012-03-173-3/+3
| | | | | | | | | | | | This reverts commit 90e3bcae6771df767c3377ca3bd6c08d99062ca3
* | | | Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1Eric Laurent2012-03-163-5/+9
|\ \ \ \
| * | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-163-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioSink latency is currently cached when the associated AudioTrack is created. However, the AudioTrack latency can change if the AudioTrack is moved from one output stream to another. The AudioPlayer must also periodically update its view of the latency as it is needed to compensate the real audio time used for A/V sync. This fixes an A/V sync problem seen when switching A2DP on and off while playing a video. Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4 Conflicts: media/libmediaplayerservice/MediaPlayerService.cpp
* | | | | Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1Eric Laurent2012-03-162-8/+7
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | AudioTrack: relax check on minimum buffer sizeEric Laurent2012-03-162-8/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current AudioTrack implementation enforces that the requested audio buffer size is at least corresponding the audio latency. This requirement is too strong and leads to problems with current stagefright and AudioSink implementations when playing over output streams with long latency. Ultimately, the AudioSink design should be changed to specify a minimum buffer size in time or frames units but not in buffer count units. Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f Conflicts: media/libmedia/AudioTrack.cpp
* | | Increase line limit for summary textAmith Yamasani2012-03-163-3/+3
|/ / | | | | | | | | | | | | | | | | | | Doing this to accomodate some really long warning text in a checkbox widget. Needs 5 lines for English. Probably a lot more for German, etc., so increasing it to 10 lines. Please don't abuse that. 4 lines is still a reasonable max. Change-Id: Ife5858f2165cb2bc046ce606f29d31010d26ecc2
* | Merge "Doc update: DDMS Network Traffic tool." into ics-mr1Katie McCormick2012-03-162-6/+79
|\ \
| * | Doc update: DDMS Network Traffic tool.Katie McCormick2012-03-162-6/+79
| | | | | | | | | | | | Change-Id: I9aa0d94e9bdc20681ec7be3f98233223c0e742d8
* | | Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1Dianne Hackborn2012-03-164-12/+169
|\ \ \
| * | | Debugging code for #6169553: Make Phone launch fasterDianne Hackborn2012-03-154-12/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The activity manager now has a tick when launching an app every 500ms, where it collects the current stack traces of the app if it hasn't finished launching. These traces are included as part of dumpstate. This is only done on non-user builds. Change-Id: I7f09ea00aab821ac81795f48c9d68fcca65f89fe
* | | | docs: Emulator Hardware Acceleration docs for SDK r17Joe Fernandez2012-03-163-1078/+884
| |_|/ |/| | | | | | | | Change-Id: I0714891d14db598f6c4acd29773975bd7754a912
* | | Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1Scott Main2012-03-1515-51/+49
|\ \ \
| * | | docs: Fix a bunch of misc doc issues from external trackerScott Main2012-03-0915-51/+49
| | | | | | | | | | | | | | | | Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73
* | | | Merge "Remove fade animations from framework drawables." into ics-mr1Dianne Hackborn2012-03-1513-26/+13
|\ \ \ \
| * | | | Remove fade animations from framework drawables.Dianne Hackborn2012-03-1413-26/+13
| | |/ / | |/| | | | | | | | | | Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
* | | | Merge "docs: update various SDK and AVD Manager screenshots and remove one ↵Scott Main2012-03-1510-13/+7
|\ \ \ \ | | | | | | | | | | | | | | | from the licensing doc that's not necessary" into ics-mr1
| * | | | docs: update various SDK and AVD Manager screenshotsScott Main2012-03-1410-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove one from the licensing doc that's not necessary Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
* | | | | docs: fix toc in search au classRobert Ly2012-03-142-3/+4
|/ / / / | | | | | | | | | | | | Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
* | | | Merge "docs: android u search class" into ics-mr1Robert Ly2012-03-145-0/+574
|\ \ \ \ | |/ / / |/| | |
| * | | docs: android u search classRobert Ly2012-03-135-0/+574
| | | | | | | | | | | | | | | | Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
* | | | Merge "docs: remove link from GP logo" into ics-mr1Scott Main2012-03-131-2/+0
|\ \ \ \
| * | | | docs: remove link from GP logoScott Main2012-03-091-2/+0
| | |/ / | |/| | | | | | | | | | Change-Id: I6dff28e84b341054874995e78d20945e70d24cae
* | | | Remove the country detector loggingDaniel Lehmann2012-03-122-2/+7
| | | | | | | | | | | | | | | | | | | | Bug:6156714 Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
* | | | Allow CDMA on LTE devices to get data connections even if otasp is needed.Wink Saville2012-03-101-1/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bearer Independent Protocol (BIP) connections as defined in ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)" need to be able to establish data connections even when not provisioned. This can occur when trying to provision on via and EVDO network. Bug: 6110632 Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
* | | Merge "A few updates for TVs." into ics-mr1Megha Joshi2012-03-081-18/+19
|\ \ \
| * | | A few updates for TVs.Megha Joshi2012-03-081-18/+19
| | | | | | | | | | | | | | | | Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
* | | | Merge "Adding TV related updates." into ics-mr1Megha Joshi2012-03-084-0/+18
|\ \ \ \
| * | | | Adding TV related updates.Megha Joshi2012-03-074-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
* | | | | docs: add troido adk linkScott Main2012-03-061-0/+3
|/ / / / | | | | | | | | | | | | Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
* | | | Merge "docs: move Android Design from static HTML to JD" into ics-mr1Roman Nurik2012-03-06285-9554/+2709
|\ \ \ \
| * | | | docs: move Android Design from static HTML to JDRoman Nurik2012-03-06285-9554/+2709
| | | | | | | | | | | | | | | | | | | | Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
* | | | | Merge "Fix badge generator URLs and images, and update script to generate ↵Scott Main2012-03-062-47/+60
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
| * | | | Fix badge generator URLs and images, and updateScott Main2012-03-062-47/+60
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | script to generate different alt text for the different button styles. Also change homepage announce link for blog post. Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
* | | | docs: a few more Market -> Play stringsScott Main2012-03-065-10/+10
|/ / / | | | | | | | | | Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
* | | Update build-a-button to use new assets.Dirk Dougherty2012-03-061-17/+18
| | | | | | | | | | | | Change-Id: I2218af60519fa3adbe574aaedb1a72270ea3c1da
* | | Merge "Fix document." into ics-mr1Pin Ting2012-03-063-7/+7
|\ \ \
| * | | Fix document.Pin Ting2012-03-063-7/+7
| | | | | | | | | | | | | | | | Change-Id: I661b259c8438f9290d57fae29a828cf4495ce335
* | | | docs: update homepage announcement for GPScott Main2012-03-052-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Still needs an update with proper blog link (will probably do by hand for launch push) Change-Id: I660082780ffd27cf591351e6b65be61a109a6d5d
* | | | Doc change: String changes for Android MarketDirk Dougherty2012-03-0599-1061/+1059
|/ / / | | | | | | | | | Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
* | | docs: fix api dashboardScott Main2012-03-051-1/+1
| | | | | | | | | | | | Change-Id: Ifbd596860f3368811e31494176682571be919459
* | | docs: fix expansion library package nameScott Main2012-03-051-11/+12
| | | | | | | | | | | | Change-Id: I38303b5650fd924ac25281baf4a7da51aa939394
* | | docs: dashboard update for march 5Scott Main2012-03-053-26/+26
| | | | | | | | | | | | Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444