Merge commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31' into kraken
* commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31':
Do not create intents for application/xhtml+xml
Merge commit '210462e57762be9bb016b4d05374cae5f48b5aea' into kraken
* commit '210462e57762be9bb016b4d05374cae5f48b5aea':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
Merge commit '34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp
* commit '34959e3fe87012d554af07fd6ad294b2ce3daea7':
Do not create intents for application/xhtml+xml
Merge commit 'e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp
* commit 'e67e6b94fd282283f1ffa2299fae536bee099715':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
Added ContentObserver to watch relevant Secure Settings.
Also added new policy-change broadcast to let settings know.
Lastly reorged things a bit so that all of our broadcasts are sent at boot so the sticky ones
are populated.
bug:2576057
Change-Id: Ie11ffb057de9c801a5088612cd464ea062f3a666
for fling, this way we will trigger animateScroll
during fling for the faster performance. We also
avoid keep removing/sending DRAG_HELD_MOTIONLESS
message during fling.
Fix http://b/issue?id=2574172
Merge commit '54c5330f23adc0f9928936f44b2d20d327d900c8' into kraken
* commit '54c5330f23adc0f9928936f44b2d20d327d900c8':
Save/restore the picture in a background thread.
Merge commit 'da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07' into froyo-plus-aosp
* commit 'da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07':
Save/restore the picture in a background thread.
Use the same procedure (select() with a short timeout) used by "logcat -d",
which doesn't seem to have any blocking problems.
Bug: 2569403
Change-Id: Ia27bb4207919a1288716b41a007b4b4b52f8e90a
Merge commit '6c099149daff56ca04ab40a86950e7b61caf6505' into kraken
* commit '6c099149daff56ca04ab40a86950e7b61caf6505':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
Merge commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp
* commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken
* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
Updating some notificiation UI for Throttling
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp
* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
Updating some notificiation UI for Throttling
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken
* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
Change TrafficStats to a new JNI implementation.
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp
* commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
Change TrafficStats to a new JNI implementation.
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken
* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
Missed these ones in the previous rename.
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp
* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
Missed these ones in the previous rename.
Merge commit '642d1556f13ac13f07515309288214e532029c50' into kraken
* commit '642d1556f13ac13f07515309288214e532029c50':
For performance reason, we choose to block the picture
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp
* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
For performance reason, we choose to block the picture
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken
* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
Add service to monitor/control the flow of data.