Merge commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3' into kraken
* commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3':
Fix last character of password field being visible after rotation
Merge commit 'f1b256f5198d12952302ef2b6214a79927918866' into froyo-plus-aosp
* commit 'f1b256f5198d12952302ef2b6214a79927918866':
Fix last character of password field being visible after rotation
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp
* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
This is a fix for http://code.google.com/p/android/issues/detail?id=907. Note that
that issue was declined without comment, but the bug (while incredibly minor)
does exist. This can be seen on the facebook app, as well as many third party apps.
Change-Id: I8f1449c47228f5f757a5baf389656e51c817b150
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken
* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
Correctly resize dialogs when measured in WRAP_CONTENT
Merge commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken
* commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
Merge commit '48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp
* commit '48bce4515d948971a122a1e17fd1919f81297d77':
Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
This is a quick and dirty solution to re-assign permissions after booting
from a platform update. It is not great, because it means that an app
can have permissions that the user didn't get to see when they originally
installed it. Unfortunately it's not clear what else to do here, nor is
there time to do anything significant.
Change-Id: I82faba141b5883c87212afa7febecf9860a413e3
Bug #2549649
If the window had a different size than its content but the content had already
been measured with the appropriate size, the window would not be resized. This
happens in wrap_content windows (dialogs.) This change simply adds a new codition
to window resizing: if the window is wrap_content, not as big as it can be and
not as big as its content, it gets resized.
Change-Id: I1d82d03af5a15c9ad8dffa0511d5f6d522578285
Merge commit 'e6fdab7f005cc06df989c97907c3cc3060692121' into kraken
* commit 'e6fdab7f005cc06df989c97907c3cc3060692121':
Forcibly unmount the sdcard after N retries.
Merge commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp
* commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
Forcibly unmount the sdcard after N retries.
Merge commit '7eeb44f20527caaad618e28ba511e7661f5904cb' into kraken
* commit '7eeb44f20527caaad618e28ba511e7661f5904cb':
Disable tethering when airplane mode is enabled
Merge commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp
* commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6':
Disable tethering when airplane mode is enabled
Tethering should be disabled when
airplane mode is enabled. Additionally,
we should restore Wifi (if it was on
before tethering was enabled) when
airplane mode is disabled.
Bug: 2567099
Change-Id: Iba2031f5ecb207954fd155c47134b39ed0167fa0
Don't rely on the ActivityManager's reported status about killing the
storage user process since the process might have gone away in between.
Change-Id: Ia7fa43eb34553329e7ff611ab6b99375b5ae673a
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken
* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
Guard against NPE in SearchManagerService
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Merge commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken
* commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65':
Redo the look of the recent apps switcher
Merge commit 'fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp
* commit 'fa588fc37420a1a4d287e6307700ca310897308a':
Redo the look of the recent apps switcher
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken
* commit 'c94dad83be792928206363cb43524a68b6a62ffe':
2568467 System crash when installing corrupt APK
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp
* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
2568467 System crash when installing corrupt APK
Also fix another crash I just saw in the package manager, when a
permission got left around from a previous install but as no
longer defined.
Change-Id: I33b87420f0c59e24b8b77fab8b0316461d99e048
Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken
* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
Fix 2325549: Allow up to 4 lines of summary text in Settings
Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp
* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
Fix 2325549: Allow up to 4 lines of summary text in Settings
