Andrew Solovay
2dd86d50ae
Merge "Removed preview license." into lmp-dev
2014-10-06 17:51:53 +00:00
Adam Powell
00092db1af
Fix build breakage in API check
...
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
2014-10-06 10:11:43 -07:00
John Spurlock
9bb3dacbf9
Fix NPE in StrictMode handling.
...
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
2014-10-06 12:36:45 -04:00
PauloftheWest
6cdeaa0d03
Fixed a Bluetooth Quick Settings update bug.
...
+ Now when a Bluetooth device disconnects, and the user is looking at quick
settings, the Bluetooth icon and text will update with the new state of
diconnected.
Bug: 17677593
Change-Id: Iccaf16a23f7e0b8690a32945906a9ccc2382cdd0
2014-10-06 09:31:48 -07:00
Yuncheol Heo
345f3d00b8
am 4cb8455f: am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
...
* commit '4cb8455fba9b70339bacf28ff813118ad542165d':
CEC: Reset active source status on routing control
2014-10-06 16:30:02 +00:00
Benjamin Franz
31409c0ccd
Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
2014-10-06 16:26:27 +00:00
Yuncheol Heo
4cb8455fba
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:22:17 +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
ce85d7f44f
am b03b9759: am 4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
...
* commit 'b03b9759d3ec1f3dacde71314795a3451f67fbab':
Recover from missing upgrade to system package.
2014-10-06 04:17:05 +00:00
Jeff Sharkey
b03b9759d3
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:57 +00:00
Jeff Sharkey
4c88087776
Merge "Recover from missing upgrade to system package." into lmp-dev
2014-10-06 04:01:34 +00:00
Wonsik Kim
aa4b0d82a1
TIF: fix retrieving sinkConfig
...
Bug: 17399450
Change-Id: I9d2f88de0fc967faeede853028f74478f4fa8f24
2014-10-06 10:02:35 +09: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
f7a9072e97
am a37450f0: (-s ours) am ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'a37450f044dee6b6f7c5568cc815a988de4e90fc':
Import translations. DO NOT MERGE
2014-10-05 18:05:02 +00:00
Baligh Uddin
26e8955348
am e823992f: (-s ours) am 9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'e823992f94d69936c926f5c00a85a4d3dbfe0a93':
Import translations. DO NOT MERGE
2014-10-05 18:04:53 +00:00
Baligh Uddin
a37450f044
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:57 +00:00
Baligh Uddin
0da4783cb7
am 8b5a7318: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '8b5a7318ff91c01b759f49aa8c9e1207d3ce90dc':
Import translations. DO NOT MERGE
2014-10-05 17:59:54 +00:00
Baligh Uddin
e823992f94
am 9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9e32249d74e0203649287f268ab6018e85e9bc50':
Import translations. DO NOT MERGE
2014-10-05 17:51:51 +00:00
Baligh Uddin
80a37a53c7
am 2f9d6c64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '2f9d6c64c29436cff4c11df8923dbe4e505e2b43':
Import translations. DO NOT MERGE
2014-10-05 17:51:46 +00:00
Baligh Uddin
ec3ce59c16
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-05 17:49:49 +00:00
Baligh Uddin
334c6232e8
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-05 17:49:49 +00:00
Baligh Uddin
8b5a7318ff
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-05 17:49:38 +00:00
Baligh Uddin
9e32249d74
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-05 17:44:58 +00:00
Baligh Uddin
98aa668ab9
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-05 17:44:55 +00:00
Baligh Uddin
2f9d6c64c2
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-05 17:44:52 +00:00
Jeff Sharkey
34f230aa4a
am c5418198: am 3438bc1b: Merge "Correctly rollback failed system app installs." into lmp-dev
...
* commit 'c5418198cc270d7e7cf1ed558c683d2794266e97':
Correctly rollback failed system app installs.
2014-10-05 05:45:30 +00:00
Jeff Sharkey
c5418198cc
am 3438bc1b: Merge "Correctly rollback failed system app installs." into lmp-dev
...
* commit '3438bc1bfd363e1ee656b33ebc8d0e6744470aec':
Correctly rollback failed system app installs.
2014-10-05 02:31:05 +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
6fe06067ff
Import translations. DO NOT MERGE
...
Change-Id: I413d08f553c47701a72eb3481fe73a5ba80ba523
Auto-generated-cl: translation import
2014-10-04 14:34:27 -07:00
Baligh Uddin
56541723bf
Import translations. DO NOT MERGE
...
Change-Id: I18962c620b68a9e1fa101aeda6f3511fb54af9c0
Auto-generated-cl: translation import
2014-10-04 14:30:00 -07: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
2c5d702cbd
Import translations. DO NOT MERGE
...
Change-Id: I0a797e49214f1d398dca7889f22cff58825a2e53
Auto-generated-cl: translation import
2014-10-04 12:02:13 -07:00
Baligh Uddin
828c0a6616
Import translations. DO NOT MERGE
...
Change-Id: Ic1a4092997c1593345815556c9a1d6126769e4b5
Auto-generated-cl: translation import
2014-10-04 11:45:08 -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
23f0778983
am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4 " into lmp-dev
...
* commit '3c6300da713a7407a3fcfba126ef912ea7bc21bc':
Fix blank Keyguard #4
2014-10-04 00:11:22 +00:00
Jorim Jaggi
3c6300da71
am eae1c3d5: Merge "Fix blank Keyguard #4 " into lmp-dev
...
* commit 'eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
Fix blank Keyguard #4
2014-10-04 00:04:22 +00:00
Robert Greenwalt
850270d5aa
am 26b7ff91: am f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
...
* commit '26b7ff9126f13c1bb65e976094727d464863fbfc':
Switch the NetworkInfo.mIsAvailable default
2014-10-03 23:57:51 +00:00
Svetoslav
423bf3d0fc
am cf0e4706: am 8ff6d70d: Merge "Clear identity before calling into the mount service." into lmp-dev
...
* commit 'cf0e4706e341f2239591af5b6934cb266cb3db61':
Clear identity before calling into the mount service.
2014-10-03 23:57:48 +00:00
Svetoslav
3eddddb51b
am c3493f94: am 88676e0b: Merge "TouchExploer computes incorrectly the click location." into lmp-dev
...
* commit 'c3493f943e89213fe0ae20fe12b586f28ceae174':
TouchExploer computes incorrectly the click location.
2014-10-03 23:57:44 +00:00
vandwalle
c67e5ae2da
am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '4f5fd78019bda5582f652393fdc3c83f45100bf1':
add millisecond timestamp to locallog
2014-10-03 23:57:40 +00:00
Jeff Sharkey
9d35c5dc79
am 4453d585: am 900e3b5f: Merge "More durable logging around system app upgrades." into lmp-dev
...
* commit '4453d5859005d5bd0da1ebc75fb1a9e5ead35021':
More durable logging around system app upgrades.
2014-10-03 23:57:36 +00:00
Jorim Jaggi
8570139447
am a359df01: am f009e358: Merge "Fix blank lockscreen #3 " into lmp-dev
...
* commit 'a359df01e012b194870d322fb1c16a6436d79f89':
Fix blank lockscreen #3
2014-10-03 23:57:33 +00:00
John Reck
6a2296d856
am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
2014-10-03 23:57:30 +00:00
Vinod Krishnan
f2ab6612c9
am 4ff457e0: System dialog looked weird on LMP
...
* commit '4ff457e07ed1b719250a10f807294fb1cc2d7431':
System dialog looked weird on LMP
2014-10-03 23:57:26 +00:00
Jorim Jaggi
eae1c3d5c1
Merge "Fix blank Keyguard #4 " into lmp-dev
2014-10-03 23:54:07 +00:00
Robert Greenwalt
26b7ff9126
am f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
...
* commit 'f393e4910b42b2c9fd4dd6f970455649e00902e5':
Switch the NetworkInfo.mIsAvailable default
2014-10-03 23:53:29 +00:00
Svetoslav
cf0e4706e3
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:53:25 +00:00
Svetoslav
c3493f943e
am 88676e0b: Merge "TouchExploer computes incorrectly the click location." into lmp-dev
...
* commit '88676e0bb1b31cafca83a6bcf5ef20cc23f163ec':
TouchExploer computes incorrectly the click location.
2014-10-03 23:53:21 +00:00