Christopher Tate
6b5eba585e
am bbebe423: Merge "adb backup/restore fixes" into lmp-dev
...
* commit 'bbebe42309a7012e0474b916f5209027889e8d57':
adb backup/restore fixes
2014-10-06 19:15:53 +00:00
Christopher Tate
bbebe42309
Merge "adb backup/restore fixes" into lmp-dev
2014-10-06 19:09:13 +00:00
Dianne Hackborn
2131b18542
am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 18:58:57 +00:00
Dianne Hackborn
7f7d240b13
Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
2014-10-06 18:48:34 +00:00
Geoff Mendal
6d93c975fb
am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
Import translations. DO NOT MERGE
2014-10-06 18:36:32 +00:00
Geoff Mendal
ec76311837
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-06 18:32:19 +00:00
John Spurlock
b76efc62de
am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
2014-10-06 18:00:09 +00:00
Andrew Solovay
71fda52abc
am 2dd86d50: Merge "Removed preview license." into lmp-dev
...
* commit '2dd86d50ae19efa071d83e02545b2767c351fdd6':
Removed preview license.
2014-10-06 17:55:05 +00:00
John Spurlock
78cc93ec80
Merge "Fix NPE in StrictMode handling." into lmp-dev
2014-10-06 17:54:41 +00:00
Geoff Mendal
86dec04749
Import translations. DO NOT MERGE
...
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
2014-10-06 10:54:01 -07:00
Andrew Solovay
2dd86d50ae
Merge "Removed preview license." into lmp-dev
2014-10-06 17:51:53 +00:00
John Spurlock
9bb3dacbf9
Fix NPE in StrictMode handling.
...
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
2014-10-06 12:36:45 -04:00
Yuncheol Heo
bcf95d55d6
am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
...
* commit '71c4578def00a5a4b9e159fd1ab88e616bc7e159':
CEC: Reset active source status on routing control
2014-10-06 16:21:30 +00:00
Yuncheol Heo
71c4578def
Merge "CEC: Reset active source status on routing control" into lmp-dev
2014-10-06 16:16:47 +00:00
Jinsuk Kim
995fcfc591
CEC: Reset active source status on routing control
...
Set active source status to false when broadcast routing control
commands indicate other device is about to be the new active source.
Bug: 17840270
Change-Id: I176e21ec8789624e29421b912ba641a21f0f5f21
2014-10-06 14:53:07 +09:00
Jeff Sharkey
aee292bda5
am 4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
...
* commit '4c88087776305f54bec0aae59b8e63bc803c1401':
Recover from missing upgrade to system package.
2014-10-06 04:08:51 +00:00
Jeff Sharkey
4c88087776
Merge "Recover from missing upgrade to system package." into lmp-dev
2014-10-06 04:01:34 +00:00
Jeff Sharkey
1c13310577
Recover from missing upgrade to system package.
...
When a system app has been upgraded, we mark the built-in version as
disabled, and skip it when parsing built-in apps, since we expect
the userdata version to be scanned a few moments later.
However, in very rare cases we can end up missing the expected
userdata version, and we'd end up dropping the package entirely, even
though we have a built-in version to fall back to. This change
handles that case by rescanning and enabling the built-in version when
the userdata version never materializes.
Also include critical log messages in check-in dumpsys to help track
down how we ended up in this state.
Bug: 17805839
Change-Id: I9971f882f9bb8ab7934c20b04e0b72366c4d04d0
2014-10-05 14:12:45 -07:00
Baligh Uddin
b71ea902ad
am ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ec3ce59c16369aa8ce63da7070be3cd5a6d8cc75':
Import translations. DO NOT MERGE
2014-10-05 17:59:00 +00:00
Baligh Uddin
c7e48f154c
am 9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9e32249d74e0203649287f268ab6018e85e9bc50':
Import translations. DO NOT MERGE
2014-10-05 17:53:14 +00:00
Baligh Uddin
ec3ce59c16
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-05 17:49:49 +00:00
Baligh Uddin
9e32249d74
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-05 17:44:58 +00:00
Jeff Sharkey
303156809b
am 3438bc1b: Merge "Correctly rollback failed system app installs." into lmp-dev
...
* commit '3438bc1bfd363e1ee656b33ebc8d0e6744470aec':
Correctly rollback failed system app installs.
2014-10-05 01:22:22 +00:00
Jeff Sharkey
3438bc1bfd
Merge "Correctly rollback failed system app installs." into lmp-dev
2014-10-05 01:06:28 +00:00
Baligh Uddin
58f23336a8
Import translations. DO NOT MERGE
...
Change-Id: Ied21f2af367832b5b11dc1ddc6f0927e47f1e113
Auto-generated-cl: translation import
2014-10-04 14:27:49 -07:00
Baligh Uddin
3613b5bfec
Import translations. DO NOT MERGE
...
Change-Id: Id8ff929363bf25f7a8971563db3fc39225016faa
Auto-generated-cl: translation import
2014-10-04 11:36:29 -07:00
Christopher Tate
ecae211616
adb backup/restore fixes
...
Bug 17811327 : teach adb restore about the new widget metadata entries
Bug 14165872 : -nosystem should not act like -onlysystem
Change-Id: I39da0ba80df7c5309a78ec1fa38016cebd80aa5f
2014-10-03 18:26:29 -07:00
Jorim Jaggi
b6606c523e
am eae1c3d5: Merge "Fix blank Keyguard #4 " into lmp-dev
...
* commit 'eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
Fix blank Keyguard #4
2014-10-04 00:03:12 +00:00
Robert Greenwalt
8c9f83f826
am f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
...
* commit 'f393e4910b42b2c9fd4dd6f970455649e00902e5':
Switch the NetworkInfo.mIsAvailable default
2014-10-03 23:57:34 +00:00
Svetoslav
356a4c16d6
am 8ff6d70d: Merge "Clear identity before calling into the mount service." into lmp-dev
...
* commit '8ff6d70d44626cd515f517962378d89ab3954979':
Clear identity before calling into the mount service.
2014-10-03 23:57:30 +00:00
Svetoslav
b027dde669
am 88676e0b: Merge "TouchExploer computes incorrectly the click location." into lmp-dev
...
* commit '88676e0bb1b31cafca83a6bcf5ef20cc23f163ec':
TouchExploer computes incorrectly the click location.
2014-10-03 23:57:26 +00:00
vandwalle
40bf513506
am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
add millisecond timestamp to locallog
2014-10-03 23:57:21 +00:00
Jeff Sharkey
ab47e4c06e
am 900e3b5f: Merge "More durable logging around system app upgrades." into lmp-dev
...
* commit '900e3b5fc5bb4bf4947f63c0fed0757dfb7effa6':
More durable logging around system app upgrades.
2014-10-03 23:57:17 +00:00
Jorim Jaggi
1918842e10
am f009e358: Merge "Fix blank lockscreen #3 " into lmp-dev
...
* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
Fix blank lockscreen #3
2014-10-03 23:57:13 +00:00
John Reck
b0d6cd236c
am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
2014-10-03 23:57:09 +00:00
Jorim Jaggi
eae1c3d5c1
Merge "Fix blank Keyguard #4 " into lmp-dev
2014-10-03 23:54:07 +00:00
Jeff Sharkey
914bd793b3
Correctly rollback failed system app installs.
...
Fix bug where we disabled system app, but never turned it back on
when the scanPackageLI() failed.
Bug: 17805839
Change-Id: I73999263aee703af187afd980fa0d0ce8451cf0c
2014-10-03 16:48:11 -07:00
Robert Greenwalt
f393e4910b
Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
2014-10-03 23:41:55 +00:00
Svetoslav
8ff6d70d44
Merge "Clear identity before calling into the mount service." into lmp-dev
2014-10-03 23:36:17 +00:00
Svetoslav
88676e0bb1
Merge "TouchExploer computes incorrectly the click location." into lmp-dev
2014-10-03 23:33:12 +00:00
Svetoslav
9f70a4cc6d
Clear identity before calling into the mount service.
...
bug:17787265
Change-Id: I4b9268d101e9ccfc30876fbf54bf28bb41fb4be6
2014-10-03 16:32:26 -07:00
vandwalle
68104b0529
Merge "add millisecond timestamp to locallog" into lmp-dev
2014-10-03 23:31:51 +00:00
Dianne Hackborn
2d7576b082
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
...
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.
Add a new REAL_GET_TASKS that is the actual permission now.
Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.
Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
2014-10-03 16:26:04 -07:00
Svetoslav
47b9c1524f
TouchExploer computes incorrectly the click location.
...
If there is accessibilty focus and the user touch explores
location that does not change accessibility focus that is
not in the app window, e.g. system bar, double tap does not
click on the system UI affordance.
bug:17588024
Change-Id: I6c8c0f65b208ae1d3f31d7f06b0721dc223ec19f
2014-10-03 16:17:26 -07:00
Robert Greenwalt
483d1fb3a6
Switch the NetworkInfo.mIsAvailable default
...
The placeholder for disconnected networks was setting it to false, but
this technically means that we know an attempt to connect to that
network will fail (which we don't really now). Some applications use
this an decide not to bother trying - an MMS app for example would
never send an MMS because it thinks the network is never available.
This is a L regression.
bug:17669247
Change-Id: Id6041f226da069c267c56418d42c55978c36c66f
2014-10-03 16:05:36 -07:00
Jorim Jaggi
5e08e6957d
Fix blank Keyguard #4
...
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.
Bug: 17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
2014-10-03 15:52:24 -07:00
vandwalle
c520aa89a3
add millisecond timestamp to locallog
...
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
2014-10-03 15:35:25 -07:00
Jeff Sharkey
900e3b5fc5
Merge "More durable logging around system app upgrades." into lmp-dev
2014-10-03 22:35:19 +00:00
Jorim Jaggi
f009e3583f
Merge "Fix blank lockscreen #3 " into lmp-dev
2014-10-03 22:33:06 +00:00
John Reck
d988a45d60
Merge "Cleanup DeferredLayerUpdater" into lmp-dev
2014-10-03 22:22:52 +00:00