Merge commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken
* commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
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
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
This fixes a number of screens in Settings (see the bug for examples).
Though it seems like a scary change, it should be safe since
the added line doesn't affect layout unless it's used, in which
case the view is slightly taller.
Change-Id: I13d04efadee19b407febabfae7825aedf66e8744
Merge commit 'e725a9634b0cea150b29755ed94c53e621b4f273' into kraken
* commit 'e725a9634b0cea150b29755ed94c53e621b4f273':
remove OTA packages from the old (pre-froyo) updater
Merge commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0' into froyo-plus-aosp
* commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0':
remove OTA packages from the old (pre-froyo) updater
The old updater ran in the system process, so only that UID can delete
its downloads. Do this on startup in case we've just upgraded from
something before froyo and need to clean up those packages.
b/2571619 - eclair -> froyo update package not deleted
Change-Id: I0a5e7834c3ecd2cc2f6fd73052b3a38e1294b5d5
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken
* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '16197a246fdeff0167f9abdc6a3da5d83759993d' into kraken
* commit '16197a246fdeff0167f9abdc6a3da5d83759993d':
Revert to previous text selection behavior
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp
* commit '21390f08138801f9e008917c0c0149839a80d002':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp
* commit '0db37997366a4d781af48be758a9d90b6d07d7d5':
Revert to previous text selection behavior
Merge commit 'f84207f6ca90307b10d94e484baf55330d644c1d' into kraken
* commit 'f84207f6ca90307b10d94e484baf55330d644c1d':
Add an extra for the Disconnect Headset State.
