Merge commit '8557df02d3aad448823cba5496908a45730d3ef8' into kraken
* commit '8557df02d3aad448823cba5496908a45730d3ef8':
doc change: fix link in guidelines index.
Merge commit '058e385b8bca0376c27a24a54f3b00777ef30e0a' into froyo-plus-aosp
* commit '058e385b8bca0376c27a24a54f3b00777ef30e0a':
doc change: fix link in guidelines index.
* Verify state change when enabling/disabling wifi
* Verify network connectivity change while switching among 3G, Wifi, and Airplane mode
Change-Id: Ia4581b10b794c7b301d28019563bca832bcd8b90
This is preliminary work for new types of Launcher widgets.
See javadoc in android.widget.Adapters for more details.
Change-Id: I413b8d5f97673e255d84dc07ad112c333c0ce9dc
Merge commit '6a3e7dfa87345244190403eaad71e760f11305ba' into kraken
* commit '6a3e7dfa87345244190403eaad71e760f11305ba':
Fix alarms with negative or very large wakup times.
Merge commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc' into froyo-plus-aosp
* commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc':
Fix alarms with negative or very large wakup times.
When the wakeup time is negative, the kernel /dev/alarm driver
never triggers the alarm. This can cause alarms to back up in the
priority queue since an alarm at the head with a negative wakup time
will never be triggered. Now we use 0 as the wakup time which causes
an immediate triggering.
When the wakeup time is very large, it is possible for a numeric
overflow to occur when converting the timestamp from milliseconds
since epoch to nanoseconds. This has been fixed by avoiding the
intermediate conversion in the JNI call so that overflow cannot
occur.
Bug: b/2558820
Change-Id: I4f5b4646a04090cc749a9fc5d3982a68402954ef
Merge commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102' into kraken
* commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102':
Fix last character of password field being visible after rotation
gl_code : add end of line.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: I4582aa1d981079ab79be442fb6185f5afaed5cf3
Changes the internal representation of direction information in the Directions object to be a visually-ordered list of start/length+direction pairs instead of a list of directionality inversion offsets.
Rewrite Layout.getOffsetToLeft/RightOf to use run information instead of width metrics.
Remove java Bidi, use native. Switch bidi tests to test native, expect levels instead of dirs.
Add test of directionality. Leave in switch to turn new code off and restore previous behavior for now.
Change-Id: Iea8bb46c678a18820e237c90f76007a084c83051
Merge commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb' into kraken
* commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb':
Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Merge commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b' into froyo-plus-aosp
* commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b':
Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Bug: 2561150
Race condition: We were basing whether the event loop is
running or not on whether nat->pollData was null or not.
In rare cases, eventLoopMain would have not started,
isEventLoopRunning returns true; java side makes a dbus call
and the watches get set to null, causing a crash in
dbus_connection_set_watch_functions when eventLoopMain starts.
Change-Id: I863f182185a8e956fd53cb58783b7fe0ecfb2ddb
Merge commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16' into kraken
* commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16':
Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58' into froyo-plus-aosp
* commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58':
Fix issue #2558391: Package manager problem when not replacing existing system partition app
This fixes the package manager to ensure we can't get in this bad state of
an update to a system app being installed as a separate app.
Change-Id: I2a3f601bbc06b74f31ca09192993614bc6885ff7
Merge commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152' into kraken
* commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152':
added a cleanspec since ActiveSyncInfo.aidl was removed
