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
Tweak OneEditTextActivitySelectedTests:testSoftKeyboardAutoPop so it always
expects IME to be shown for devices with no hard keyboard.
Bug 2267311 2318969
Change-Id: Ica31e8f1153cf3e7dbc838d263ea0ae805161610
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
The package manager contains an optimization which reuses cached
signatures instead of reloading them on startup if the package
appears to be unchanged. This commit adds an extra check to ensure
that the PackageSettings object actually has valid signatures since
it has happened that they have gone missing. Unfortunately it does
not address the root cause of the problem but it should alleviate the
symptoms after a reboot.
Bug: b/2547993
Change-Id: I41900c6a752711eb3a901360e3bb29aec946d0be
Merge commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c' into kraken
* commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c':
Refactor connection/redirection code, support redirects on reconnection.
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken
* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
Add service to monitor/control the flow of data.
Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp
* commit 'eb12e45f7a92fd424988451256c82605d086245d':
Refactor connection/redirection code, support redirects on reconnection.
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp
* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
Add service to monitor/control the flow of data.
Merge commit '727cec02daa66b5e984aff277185d503fabe5d51' into kraken
* commit '727cec02daa66b5e984aff277185d503fabe5d51':
Fix reporting of window visibility in WindowManagerService.
Merge commit '6b04d5c735df7fa05c705f979eff8821989ab73d' into kraken
* commit '6b04d5c735df7fa05c705f979eff8821989ab73d':
docs: revisions to the installLocation documentation
Merge commit '4981863de52941f053bf002ae2f9c8f705534599' into froyo-plus-aosp
* commit '4981863de52941f053bf002ae2f9c8f705534599':
docs: revisions to the installLocation documentation