64541 Commits

Author SHA1 Message Date
Wink Saville
170bfe32ab am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
  Use new preferredAPN URI avoiding onApnChanged() call with self-change
2012-01-18 16:08:04 -08:00
Christopher Tate
d3f2f59c46 Merge "Fix edge cases leading to backup hanging forever" 2012-01-18 16:07:28 -08:00
Wink Saville
7b6231a44e am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit 'aba798510129327a046d57844381382fb1faa3ba':
  Use new preferredAPN URI avoiding onApnChanged() call with self-change
2012-01-18 16:05:43 -08:00
Wink Saville
aba7985101 Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 2012-01-18 16:03:24 -08:00
Christopher Tate
6de74ff2a4 Fix edge cases leading to backup hanging forever
Plug a couple of apparent code paths (one not obviously reachable, but
fixed here on general principles) that could lead to a backup pass
getting confused partway through and simply never properly completing.
In this state it would leave its wakelock held forever until next
reboot.  Bug 5828859.

Those fixes are a total of two lines of code. The rest of the patch
adds a textual journal of the most recently completed (or ongoing!)
backup pass's progress, with an eye to being able to isolate any such
issues that may crop up in the future.

Change-Id: If8a5e8aba11db5a1e618d8b9c9ba3038dd5377a1
2012-01-18 15:44:47 -08:00
Stephen Hines
03cbb97e4e Merge "Run ComputePerf multiple times." 2012-01-18 15:42:46 -08:00
Stephen Hines
1f541a0423 Run ComputePerf multiple times.
Change-Id: I715c726f15416685b715a14a25c9595d9a9a124b
2012-01-18 15:06:57 -08:00
Adam Powell
ea77ed02e4 am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
  Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
2012-01-18 14:51:35 -08:00
Adam Powell
a6a0d134eb am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '04f3848986efda8cf006f575d2e4990f120a1bc8':
  Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
2012-01-18 14:49:30 -08:00
Adam Powell
04f3848986 Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 2012-01-18 14:47:20 -08:00
Jeff Brown
2a16b13744 Merge "Improve heuristics for orientation detection." 2012-01-18 14:43:16 -08:00
Michael Kolb
d9fdd9fd78 Merge "Prevent IME from popping up on startup" 2012-01-18 14:00:52 -08:00
Robert Ly
ca917ac1e6 am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit 'c891c6eff7ab320092af4ec5b235f83866f66261':
  docs: adding rs api docs
2012-01-18 13:21:54 -08:00
Robert Ly
b41c96a374 am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '43fda84e91b1fe356af35386d2f304d3ab71529e':
  update overview page for rs api docs to open iframe links in parent
2012-01-18 13:21:51 -08:00
Robert Ly
c891c6eff7 am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '013dbcf0783f55efbb75e6c2794478c27d172c8c':
  docs: adding rs api docs
2012-01-18 13:19:52 -08:00
Robert Ly
43fda84e91 am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '6ad9ea7deb669eca68c58f001c935255c3294cfe':
  update overview page for rs api docs to open iframe links in parent
2012-01-18 13:19:50 -08:00
Robert Ly
013dbcf078 Merge "docs: adding rs api docs" into ics-mr1 2012-01-18 13:18:11 -08:00
Robert Ly
6ad9ea7deb Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 2012-01-18 13:17:51 -08:00
Martijn Coenen
1ad65e7054 Merge "Remove LlcpPacket from public namespace." 2012-01-18 13:09:55 -08:00
Joe Fernandez
5689317a6f am 58f9c3da: am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '58f9c3da340eb36051bc20d6b8cec6b982852ee0':
  docs: Android API 15 SDK r2 Release Notes
2012-01-18 12:37:22 -08:00
Joe Fernandez
58f9c3da34 am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
  docs: Android API 15 SDK r2 Release Notes
2012-01-18 12:35:30 -08:00
Joe Fernandez
dd41d360ea Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 2012-01-18 12:33:45 -08:00
Michael Kolb
17146c7cc0 Prevent IME from popping up on startup
Bug: 5869028

Change-Id: Ie5c7004def16eeac4147d19fb00fc9631a17579e
2012-01-18 11:20:01 -08:00
Andreas Huber
b2d81fead9 Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures" 2012-01-18 11:01:00 -08:00
Andreas Huber
28ea013f25 Temporarily restore AudioSystem/AudioTrack APIs with their former signatures
until we get updated prebuilts from vendor.

Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
2012-01-18 10:51:55 -08:00
John Reck
955fdda057 Add tapHighlightColor support
Change-Id: I419eb3d8f1050efd05bb989a6b353ad45ee77acf
2012-01-18 09:36:43 -08:00
Andreas Huber
70a957cef1 Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)" 2012-01-18 09:29:56 -08:00
Bryan Mawhinney
f429b6a901 Merge "Make sure seek triggers a reconnect if needed." 2012-01-18 08:58:19 -08:00
Glenn Kasten
540c35f7aa Merge "Track volume cleanup" 2012-01-18 07:46:18 -08:00
Bryan Mawhinney
c14cc17972 Make sure seek triggers a reconnect if needed.
Previously, if we had disconnected at the high watermark,
the read immediately following a seek would fail, and would
not be retried, resulting in an error.

Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
2012-01-18 13:43:16 +00:00
Jean Chalard
96c804af0b Add methods to support shortcuts in user dict.
Adds the new interface to the user dictionary, which includes
a clean way of inserting words in any locale and support for
shortcuts.

Change Ib318c047 implements the provider part of this.

Bug: 4646172
Change-Id: Id3ca792f2555fac46728f9d404ab0199971f6503
2012-01-18 18:54:34 +09:00
Romain Guy
fb9ffe0260 Merge "First pass at implementing Canvas.drawPosText() in GL" 2012-01-17 17:40:24 -08:00
Romain Guy
eb9a5367e8 First pass at implementing Canvas.drawPosText() in GL
Change-Id: Ia3ac347e95d57eb86c63045156c8dbc0572b03cb
2012-01-17 17:39:26 -08:00
Eric Laurent
1be4afecb7 Merge "audio framework: manage stream volume per device" 2012-01-17 17:35:03 -08:00
Romain Guy
d33f97f196 Merge "Free optimization" 2012-01-17 17:33:15 -08:00
Romain Guy
d1d4bb7070 Free optimization
Using the TextLayoutCache with the GL renderer should help...

Change-Id: I73a19be040165212839e2a40d4183e998f9dfb7f
2012-01-17 17:31:27 -08:00
Svetoslav Ganov
0764dee89c Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes." 2012-01-17 17:25:56 -08:00
Jeff Brown
5aa73ae58f Improve heuristics for orientation detection.
1. Except as otherwise indicated, orientation change happens once
   the predicted rotation has been stable for 40ms.  Noise is
   suppressed by a low-pass filter with a 200ms time constant which
   seems to be about as small as is practical given the quality
   of the sensor data.

2. If the magnitude exceeds a threshold (excessive noise or freefall),
   resets the predicted orientation.
   Doesn't happen very often even when shaking the device.
   This heuristic mainly protects the detector from spurious tilt due
   to inaccurate determination of the gravity vector.

3. If the device was previously in a flat posture (on a table for at
   least 1000ms), then it must move out of that posture for at least
   500ms before the next orientation change will happen.
   This heuristic suppresses most spurious rotations that happen while
   picking up the device.

4. If the device is tilted away from the user by 20 degrees within
   a span of 300ms, the device is said to be swinging and at least
   300ms must elapse after the device stops swinging before the
   next orientation change will happen.
   This heuristic suppresses some but not all spurious rotations that
   happen while putting down a device.  Unfortunately, this heuristic
   sometimes triggers a false positive when turning the device very
   rapidly due to accelerometer noise.  The 300ms pause is a compromise
   so that occasional mispredicted swings don't significantly delay
   the rotation.

Bug: 5796249
Change-Id: Id7b36c4c563e35b70d6a7ac36d04f3c3d6ea5811
2012-01-17 17:07:10 -08:00
Tadashi G. Takaoka
fa326d1c46 Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions" 2012-01-17 16:57:56 -08:00
Glenn Kasten
0632bad8ba Track volume cleanup
Always read and write track volumes atomically. In most places this was
already being done, but there were a couple places where the left and
right channels were read independently.

Changed constant MAX_GAIN_INT to be a uint32_t instead of a float.
It is always used as a uint32_t in comparisons and assignments.
Use MAX_GAIN_INT in more places.

Now that volume is always accessed atomically, removed the union
and alias for uint16_t volume[2], and kept only volumeLR.

Removed volatile as it's meaningless.

In AudioFlinger, clamp the track volumes read from shared memory
before applying master and stream volume.

Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
2012-01-17 16:25:17 -08:00
Robert Ly
dc6720f34b docs: adding rs api docs
Change-Id: Ib56ee177439e9c124d0ac4053ed4173f8a4be1aa
2012-01-17 16:14:44 -08:00
Teng-Hui Zhu
48592a3d21 Merge "Support javascript to exit full screen video." 2012-01-17 15:35:04 -08:00
Adam Cohen
792840d48a Merge "Hinting RemoteViewsAdapter as to which views are visible" 2012-01-17 15:25:22 -08:00
Teng-Hui Zhu
d7678a1684 Support javascript to exit full screen video.
When javascript request exit full screen, WebViewCore need to handle the
message from webkit thread and hide the custom view.

Webkit part:
https://android-git.corp.google.com/g/#/c/158652/

Change-Id: I9edbb5a4059f330fb29df116ae076ec52f81a1af
2012-01-17 15:21:42 -08:00
Adam Cohen
b967392e01 Hinting RemoteViewsAdapter as to which views are visible
-> This prevents collection widgets from flashing loading
   views when they are updated with new content

Change-Id: I1241ff9a09edfd990ad03f76449d18b9359246b4
2012-01-17 15:21:34 -08:00
Eric Laurent
9bc8358dda audio framework: manage stream volume per device
Improve volume management by keeping track of volume for each type
of device independently.
Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained
per device.

The main changes are:
- AudioService now keeps tracks of stream volumes per device:
 volume indexes are kept in a HashMap < device , index>.
 active device is queried from policy manager when a volume change request
 is received
 initalization, mute and unmute happen on all device simultaneously
- Settings: suffixes is added to volume keys to store each device
volume independently.
- AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument
to setStreamVolumeIndex() and getStreamVolumeIndex() to address each
device independently.
- AudioPolicyManagerBase: keep track of stream volumes for each device
and apply volume according to current device selection.

Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
2012-01-17 15:15:04 -08:00
Michael Jurka
73d27c3d46 Merge "Check if View's alpha must be updated in setter" 2012-01-17 15:05:23 -08:00
Romain Guy
11d06a73df Merge "Fix text encoding when drawing with drawPosText in software" 2012-01-17 14:54:45 -08:00
Romain Guy
62b6eaa7f3 Fix text encoding when drawing with drawPosText in software
Change-Id: I0cd8ee526189c38c50953a1a08b50e0b31c55d8c
2012-01-17 14:53:26 -08:00
Svetoslav Ganov
8a78fd4d95 AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes.
AccessibilityEvent and AccessibilityNodeInfo have a property className which is set to the source
Java class. This is problematic since leads to leaking private classes which would allow an
accessibility service to load classes from other packages. This is strongly undesirable since
not trusted code can be loaded, and hence executed, in the accessibility service. To address
that the class name is set to the most concrete framework class extended by the info/event
source.

bug:5878943

Change-Id: I7b3114ece8772ea2773f5151e21b8a6f2006882a
2012-01-17 14:51:45 -08:00