64961 Commits

Author SHA1 Message Date
Jamie Gennis
7bea650208 Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 2012-01-27 09:53:14 -08:00
Glenn Kasten
c14639a9a1 Merge "Use audio_source_t consistently" 2012-01-27 09:06:00 -08:00
Glenn Kasten
c1f63ddba7 Merge "AudioStreamIn and AudioStreamOut" 2012-01-27 07:22:30 -08:00
Glenn Kasten
6562dadf3c Merge "Declare methods in binder opcode order" 2012-01-27 07:19:53 -08:00
Glenn Kasten
591993f162 Merge "Use enum effect_state consistently" 2012-01-27 07:19:10 -08:00
Glenn Kasten
86012869b8 Merge "Use enum track_state consistently" 2012-01-27 07:18:23 -08:00
Glenn Kasten
43f4dd4fa1 Merge "Use enum mixer_state consistently" 2012-01-27 07:16:46 -08:00
Alon Albert
815af1ff59 Merge "Throw NPE if s is null" 2012-01-26 17:05:58 -08:00
Glenn Kasten
0f0fbd9441 Use audio_source_t consistently
Was a mix of audio_source_t, uint8_t, and int.

Related fixes:
 - fix comments in MediaRecorder.java
 - AudioPolicyService server side was not checking source parameter at
   all, so if the client wrapper was bypassed, invalid values could be
   passed into audio HAL
 - JNI android_media_AudioRecord_setup was checking source for positive
   values, but not negative values. This test is redundant, since already
   checked at Java and now checked by AudioPolicyService also, but might
   as well make it correct.

Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
2012-01-26 16:50:19 -08:00
Andreas Huber
4bc8bfaf11 Merge "The software AAC encoder is now an OMX component." 2012-01-26 16:00:38 -08:00
Glenn Kasten
5b0135e41b AudioStreamIn and AudioStreamOut
These are immutable, so make the fields const.
getOutput() and getInput() methods are now const.

Change-Id: I128246ebd56ea50b3e542be43f2aa1bcb55f1373
2012-01-26 15:58:07 -08:00
Chet Haase
23fb7dc7c7 Merge "Fix old issue with compatibility-scaled apps and Animations" 2012-01-26 15:53:03 -08:00
Daniel Sandler
bbbf6b9c49 am 70828a1d: am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '70828a1d40c9bf0e5066166216013093298de034':
  Suppress mobile-out-of-service label if wifi connected.
2012-01-26 15:47:06 -08:00
Andreas Huber
afe02df45e The software AAC encoder is now an OMX component.
Yay.

Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
2012-01-26 15:45:38 -08:00
Geremy Condra
838a0e0ed8 Merge "Removed intent logging from SearchDialog.java" 2012-01-26 15:06:18 -08:00
Glenn Kasten
0ae4d97689 Declare methods in binder opcode order
This makes it easier to compare interface and implementation.

Change-Id: Ie060e43dec348902abcf40f5a610cec639d6d0d3
2012-01-26 14:34:30 -08:00
Jim Miller
fb9e364380 Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled." 2012-01-26 14:30:49 -08:00
Eric Fischer
b14ecd2684 Merge "Import translations. DO NOT MERGE" 2012-01-26 14:26:10 -08:00
Alon Albert
11afa8a466 Throw NPE if s is null
Bug: 5926510
Change-Id: I3d0a38d31695a8b103b3d153d90d83474f56990e
2012-01-26 14:25:19 -08:00
Glenn Kasten
789fef1f83 Use enum mixer_state consistently
Change-Id: I5b71ed20f939dfc4b98143334b7aa064d282f584
2012-01-26 14:23:47 -08:00
Eric Fischer
3b5e2c3bde Import translations. DO NOT MERGE
Change-Id: I9ecc6b7fd129f9b430d96e4d65c656a2b71bd0af
2012-01-26 14:21:26 -08:00
Glenn Kasten
452d6d6efe Use enum effect_state consistently
Also fix indentation

Change-Id: I393ef9e37ffceed5ad4a78df439726ae1fe139df
2012-01-26 14:20:34 -08:00
Glenn Kasten
563562032d Use enum track_state consistently
Change-Id: Ie5ebb7befa092e1de1e4df9c6e2d51e6bcfd176a
2012-01-26 14:13:43 -08:00
Gilles Debunne
e93c51713c Merge "Modified algorithm to remove duplicated suggestions" 2012-01-26 14:09:20 -08:00
Gilles Debunne
89429a4211 Merge "Remove @deprecate in View's fadingEdge" 2012-01-26 14:09:00 -08:00
Stephen Hines
caaac348ed Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 2012-01-26 13:55:57 -08:00
Gilles Debunne
259c109046 Remove @deprecate in View's fadingEdge
The comment of this field is also aggregated in the android.R.styleable#View
description. As a result, the @deprecated in the comment of this field also
applies to android.R.styleable#View which incorrectly appears deprecated.

This fixes the problem, although fadingEdge will no longer be marked as
deprecated in IDEs. I believe it is less important that to make View
deprecated.

Change-Id: I96d8e868001c4c853eb1536f8401275b9b1e689b
2012-01-26 13:46:25 -08:00
Daniel Sandler
70828a1d40 am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.
2012-01-26 13:04:17 -08:00
Daniel Sandler
5b08738a62 Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Chet Haase
53f2d55740 Fix old issue with compatibility-scaled apps and Animations
Previously, we'd pass in a scale factor (based on whether the app was
being scaled by the compatibility mode) to Animation.getTransformation().
This scales the pivot point of the animation based on thes cale factor.
However, the pivot points were already using information that took the
compatibility mode scale into account. For example, using ABSOLUTE and basing
pixel values on the width/height of the view would give you values relative to the
width/height of the view (pre-scaled). Using RELATIVE_TO_* would use percentages
for the pivot point, again taking the scaling of the view into account. So scaling
the pivot point added in another scale on top of that already being applied.

The net effect was to scale the pivot point in cases where it should not be scale.
For example, setting a pivot point to half-way (.5 and RELATVE_TO_SELF) would
end up with an animation that would pivot around the bottom/right of the view.

The fix is to simply remove the scale factor being passed in; we've already accounted
for it in the pivot point, so we shouldn't concatenate it into the transform
calculated by the animation.

Change-Id: I9daa7581b1b9d0dfb10515e96947160c28c5130e
2012-01-26 12:44:46 -08:00
Daniel Sandler
62a1eb8972 Suppress mobile-out-of-service label if wifi connected.
Carrier name is shown if
 - in service and connected to mobile data
 - in service and connected to wifi

Carrier name is blanked if out of service and connected to
wifi.

"No internet connection" is shown if out of service without
any other route.

Bug: 5903914
Change-Id: I59d4d0c90e4153d73c38f7f0e150becf7e021a5b
2012-01-26 15:35:03 -05:00
Scott Main
7e4ef61732 am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP
* commit '2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
  docs: add action bar icons ZIP
2012-01-26 11:47:35 -08:00
Scott Main
2de74f5fa9 am 6c055bbd: docs: add action bar icons ZIP
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP
2012-01-26 11:44:58 -08:00
Scott Main
6c055bbdf4 docs: add action bar icons ZIP
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
2012-01-26 11:35:20 -08:00
Ben Cheng
f429ff7077 Merge "Preserve NEON callee-save registers d8-d15." 2012-01-26 11:16:59 -08:00
Ben Cheng
44094486b0 Preserve NEON callee-save registers d8-d15.
BUG:5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
2012-01-26 10:34:52 -08:00
Jim Miller
93708af132 Fix 5620754: don't show pattern unlock after SIM unlock if not enabled.
This fixes a bug where the device would show pattern unlock after the user
entered the SIM PUK unlock code.  The code now correctly determines that
the device isn't secure and thus shouldn't show the unlock screen.

Change-Id: I49fd749592154a4c5840038b92d54ca7ca086074
2012-01-25 18:26:12 -08:00
Stephen Hines
109116bb2f Fix bugs with unsigned rsAtomicCas/Max/Min.
BUG=5888007

rsAtomicMax/Min did not have proper semantics for unsigned integers. They were
always using signed comparisons. rsAtomicCas had the wrong function signature
in our math library, leading to no way to properly link/execute it.

Change-Id: I336cdd8cd9f2d8093f12e101b55b2797515f039b
2012-01-25 18:17:34 -08:00
Scott Main
9413752f30 am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit 'e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
  docs: remove the 1.0 icon template pack
2012-01-25 18:03:20 -08:00
Scott Main
e7ffc5a633 am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
  docs: remove the 1.0 icon template pack
2012-01-25 18:00:42 -08:00
Scott Main
9ac4dd8280 Merge "docs: remove the 1.0 icon template pack" into ics-mr1 2012-01-25 17:58:54 -08:00
Scott Main
8a89e93ba4 am 1f9026ca: am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
  docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:54:48 -08:00
Scott Main
3fe452906d docs: remove the 1.0 icon template pack
Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
2012-01-25 17:54:28 -08:00
Scott Main
1f9026caf1 am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
  docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:52:08 -08:00
Scott Main
f466db14ec Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 2012-01-25 17:50:20 -08:00
Scott Main
948eb9b29e docs: remove ADL presentation PDFs to conserve site space
Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
2012-01-25 17:47:46 -08:00
Joe Malin
bf80175cca am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:33:06 -08:00
Joe Malin
ba8dd79f4e am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:30:13 -08:00
Joe Malin
9f426604e6 am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:27:46 -08:00
Svetoslav Ganov
758d97c312 Merge "Fixing failing focus tests" 2012-01-25 17:09:54 -08:00