Merge commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9' into kraken
* commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9':
Test connecitvity manager functionality in state change.
Merge commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5' into kraken
* commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5':
Fix crash while turning bluetooth on, due to a race condition.
Merge commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9' into froyo-plus-aosp
* commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9':
Test connecitvity manager functionality in state change.
Merge commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6' into froyo-plus-aosp
* commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6':
Fix crash while turning bluetooth on, due to a race condition.
The certificates of the package and its shared user certificates
are initialized only when installing the package.
When scanning the packages, the certificates are collected from the apk
if the time stamp changes. If not the one's from
PackageSetting(read from packages.xml) are reused.
Removed mergeSignatures and updateSignatures since we don't support
this any more.
Also fix some bugs related to reinstalling failed upgrades.
Some unit tests.
Change-Id: Ibdeff170bd386d723f774136b18e0ad59d9cdabb
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
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.
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
Merge commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken
* commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
Use case insensitive matching.
Merge commit '9b9a89a58f50c3004959c36252489fae54fb9c58' into froyo-plus-aosp
* commit '9b9a89a58f50c3004959c36252489fae54fb9c58':
added a cleanspec since ActiveSyncInfo.aidl was removed
Merge commit '9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp
* commit '9253446922d925f6a5453b60d539beed292921a7':
Use case insensitive matching.
