OSDN Git Service
Andrew Solovay [Mon, 6 Oct 2014 19:22:40 +0000 (19:22 +0000)]
am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
ed2237aec8d348ee530f0c88c08392351690e5bb':
Removed preview license.
Geoff Mendal [Mon, 6 Oct 2014 19:18:36 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Andrew Solovay [Mon, 6 Oct 2014 19:16:47 +0000 (19:16 +0000)]
am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
2dd86d50ae19efa071d83e02545b2767c351fdd6':
Removed preview license.
Benson Huang [Mon, 6 Oct 2014 18:54:19 +0000 (18:54 +0000)]
am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
ce4483cb83afb3a42a32ef2cb00cf04d6f9018fd':
[FM] Add FM_TUNER audio source to support L version FM radio app
Benson Huang [Wed, 17 Sep 2014 09:21:02 +0000 (17:21 +0800)]
[FM] Add FM_TUNER audio source to support L version FM radio app
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
2.AudioRecord.java: For FM output to the other device,
(except the headset case), record the FM tuner signal to a track
and playback the recorded signal by a track.
3.AudioAttributes.java: Thus we use AudioRecord, need to modify
setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.
Review: https://partner-android-review.git.corp.google.com/#/c/182071
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
Geoff Mendal [Mon, 6 Oct 2014 18:46:22 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia892f6f28e8ad353ae460f3e167bb68d2246ac13
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:38:41 +0000 (18:38 +0000)]
am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
937d6a6476be3ce06f3c9c10836a4399b7514231':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:33:45 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 18:32:34 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 6 Oct 2014 17:56:58 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 17:55:10 +0000 (10:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb7aeaea1204f4ba7daf3abd7a30f647564807dd
Auto-generated-cl: translation import
Andrew Solovay [Mon, 6 Oct 2014 17:51:52 +0000 (17:51 +0000)]
Merge "Removed preview license." into lmp-dev
Adam Powell [Mon, 6 Oct 2014 17:11:43 +0000 (10:11 -0700)]
Fix build breakage in API check
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
Yuncheol Heo [Mon, 6 Oct 2014 16:30:02 +0000 (16:30 +0000)]
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
Benjamin Franz [Mon, 6 Oct 2014 16:26:24 +0000 (16:26 +0000)]
Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
Yuncheol Heo [Mon, 6 Oct 2014 16:22:17 +0000 (16:22 +0000)]
am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
71c4578def00a5a4b9e159fd1ab88e616bc7e159':
CEC: Reset active source status on routing control
Yuncheol Heo [Mon, 6 Oct 2014 16:16:45 +0000 (16:16 +0000)]
Merge "CEC: Reset active source status on routing control" into lmp-dev
Jinsuk Kim [Mon, 6 Oct 2014 05:28:06 +0000 (14:28 +0900)]
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
Jeff Sharkey [Mon, 6 Oct 2014 04:17:05 +0000 (04:17 +0000)]
am
b03b9759: am
4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
* commit '
b03b9759d3ec1f3dacde71314795a3451f67fbab':
Recover from missing upgrade to system package.
Jeff Sharkey [Mon, 6 Oct 2014 04:08:57 +0000 (04:08 +0000)]
am
4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
* commit '
4c88087776305f54bec0aae59b8e63bc803c1401':
Recover from missing upgrade to system package.
Jeff Sharkey [Mon, 6 Oct 2014 04:01:33 +0000 (04:01 +0000)]
Merge "Recover from missing upgrade to system package." into lmp-dev
Wonsik Kim [Mon, 6 Oct 2014 00:58:35 +0000 (09:58 +0900)]
TIF: fix retrieving sinkConfig
Bug:
17399450
Change-Id: I9d2f88de0fc967faeede853028f74478f4fa8f24
Jeff Sharkey [Sun, 5 Oct 2014 21:12:42 +0000 (14:12 -0700)]
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
Baligh Uddin [Sun, 5 Oct 2014 18:05:02 +0000 (18:05 +0000)]
am
a37450f0: (-s ours) am
ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a37450f044dee6b6f7c5568cc815a988de4e90fc':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:04:53 +0000 (18:04 +0000)]
am
e823992f: (-s ours) am
9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e823992f94d69936c926f5c00a85a4d3dbfe0a93':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:59:57 +0000 (17:59 +0000)]
am
ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ec3ce59c16369aa8ce63da7070be3cd5a6d8cc75':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:59:54 +0000 (17:59 +0000)]
am
8b5a7318: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
8b5a7318ff91c01b759f49aa8c9e1207d3ce90dc':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:51:51 +0000 (17:51 +0000)]
am
9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9e32249d74e0203649287f268ab6018e85e9bc50':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:51:46 +0000 (17:51 +0000)]
am
2f9d6c64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
2f9d6c64c29436cff4c11df8923dbe4e505e2b43':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:49:44 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 5 Oct 2014 17:49:44 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Sun, 5 Oct 2014 17:49:36 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Sun, 5 Oct 2014 17:44:57 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 5 Oct 2014 17:44:54 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Sun, 5 Oct 2014 17:44:51 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Jeff Sharkey [Sun, 5 Oct 2014 05:45:30 +0000 (05:45 +0000)]
am
c5418198: am
3438bc1b: Merge "Correctly rollback failed system app installs." into lmp-dev
* commit '
c5418198cc270d7e7cf1ed558c683d2794266e97':
Correctly rollback failed system app installs.
Jeff Sharkey [Sun, 5 Oct 2014 02:31:05 +0000 (02:31 +0000)]
am
3438bc1b: Merge "Correctly rollback failed system app installs." into lmp-dev
* commit '
3438bc1bfd363e1ee656b33ebc8d0e6744470aec':
Correctly rollback failed system app installs.
Jeff Sharkey [Sun, 5 Oct 2014 01:06:26 +0000 (01:06 +0000)]
Merge "Correctly rollback failed system app installs." into lmp-dev
Baligh Uddin [Sat, 4 Oct 2014 21:34:27 +0000 (14:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I413d08f553c47701a72eb3481fe73a5ba80ba523
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 21:30:00 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18962c620b68a9e1fa101aeda6f3511fb54af9c0
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 21:27:49 +0000 (14:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied21f2af367832b5b11dc1ddc6f0927e47f1e113
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 19:02:13 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0a797e49214f1d398dca7889f22cff58825a2e53
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 18:45:08 +0000 (11:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1a4092997c1593345815556c9a1d6126769e4b5
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 18:36:29 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8ff929363bf25f7a8971563db3fc39225016faa
Auto-generated-cl: translation import
Jorim Jaggi [Sat, 4 Oct 2014 00:11:22 +0000 (00:11 +0000)]
am
3c6300da: am
eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev
* commit '
3c6300da713a7407a3fcfba126ef912ea7bc21bc':
Fix blank Keyguard #4
Jorim Jaggi [Sat, 4 Oct 2014 00:04:22 +0000 (00:04 +0000)]
am
eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev
* commit '
eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
Fix blank Keyguard #4
Robert Greenwalt [Fri, 3 Oct 2014 23:57:51 +0000 (23:57 +0000)]
am
26b7ff91: am
f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
* commit '
26b7ff9126f13c1bb65e976094727d464863fbfc':
Switch the NetworkInfo.mIsAvailable default
Svetoslav [Fri, 3 Oct 2014 23:57:48 +0000 (23:57 +0000)]
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.
Svetoslav [Fri, 3 Oct 2014 23:57:44 +0000 (23:57 +0000)]
am
c3493f94: am
88676e0b: Merge "TouchExploer computes incorrectly the click location." into lmp-dev
* commit '
c3493f943e89213fe0ae20fe12b586f28ceae174':
TouchExploer computes incorrectly the click location.
vandwalle [Fri, 3 Oct 2014 23:57:40 +0000 (23:57 +0000)]
am
4f5fd780: am
68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
* commit '
4f5fd78019bda5582f652393fdc3c83f45100bf1':
add millisecond timestamp to locallog
Jeff Sharkey [Fri, 3 Oct 2014 23:57:36 +0000 (23:57 +0000)]
am
4453d585: am
900e3b5f: Merge "More durable logging around system app upgrades." into lmp-dev
* commit '
4453d5859005d5bd0da1ebc75fb1a9e5ead35021':
More durable logging around system app upgrades.
Jorim Jaggi [Fri, 3 Oct 2014 23:57:33 +0000 (23:57 +0000)]
am
a359df01: am
f009e358: Merge "Fix blank lockscreen #3" into lmp-dev
* commit '
a359df01e012b194870d322fb1c16a6436d79f89':
Fix blank lockscreen #3
John Reck [Fri, 3 Oct 2014 23:57:30 +0000 (23:57 +0000)]
am
9da6e743: am
d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
* commit '
9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
Vinod Krishnan [Fri, 3 Oct 2014 23:57:26 +0000 (23:57 +0000)]
am
4ff457e0: System dialog looked weird on LMP
* commit '
4ff457e07ed1b719250a10f807294fb1cc2d7431':
System dialog looked weird on LMP
Jorim Jaggi [Fri, 3 Oct 2014 23:54:06 +0000 (23:54 +0000)]
Merge "Fix blank Keyguard #4" into lmp-dev
Robert Greenwalt [Fri, 3 Oct 2014 23:53:29 +0000 (23:53 +0000)]
am
f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
* commit '
f393e4910b42b2c9fd4dd6f970455649e00902e5':
Switch the NetworkInfo.mIsAvailable default
Svetoslav [Fri, 3 Oct 2014 23:53:25 +0000 (23:53 +0000)]
am
8ff6d70d: Merge "Clear identity before calling into the mount service." into lmp-dev
* commit '
8ff6d70d44626cd515f517962378d89ab3954979':
Clear identity before calling into the mount service.
Svetoslav [Fri, 3 Oct 2014 23:53:21 +0000 (23:53 +0000)]
am
88676e0b: Merge "TouchExploer computes incorrectly the click location." into lmp-dev
* commit '
88676e0bb1b31cafca83a6bcf5ef20cc23f163ec':
TouchExploer computes incorrectly the click location.
vandwalle [Fri, 3 Oct 2014 23:53:17 +0000 (23:53 +0000)]
am
68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
* commit '
68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
add millisecond timestamp to locallog
Jeff Sharkey [Fri, 3 Oct 2014 23:53:12 +0000 (23:53 +0000)]
am
900e3b5f: Merge "More durable logging around system app upgrades." into lmp-dev
* commit '
900e3b5fc5bb4bf4947f63c0fed0757dfb7effa6':
More durable logging around system app upgrades.
Jorim Jaggi [Fri, 3 Oct 2014 23:53:09 +0000 (23:53 +0000)]
am
f009e358: Merge "Fix blank lockscreen #3" into lmp-dev
* commit '
f009e3583f2843a463d75f06675ef18c398b0efd':
Fix blank lockscreen #3
John Reck [Fri, 3 Oct 2014 23:53:05 +0000 (23:53 +0000)]
am
d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
* commit '
d988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
Jeff Sharkey [Fri, 3 Oct 2014 23:48:11 +0000 (16:48 -0700)]
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
Robert Greenwalt [Fri, 3 Oct 2014 23:41:54 +0000 (23:41 +0000)]
Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
Svetoslav [Fri, 3 Oct 2014 23:36:16 +0000 (23:36 +0000)]
Merge "Clear identity before calling into the mount service." into lmp-dev
Svetoslav [Fri, 3 Oct 2014 23:33:11 +0000 (23:33 +0000)]
Merge "TouchExploer computes incorrectly the click location." into lmp-dev
Svetoslav [Fri, 3 Oct 2014 23:32:23 +0000 (16:32 -0700)]
Clear identity before calling into the mount service.
bug:
17787265
Change-Id: I4b9268d101e9ccfc30876fbf54bf28bb41fb4be6
vandwalle [Fri, 3 Oct 2014 23:31:49 +0000 (23:31 +0000)]
Merge "add millisecond timestamp to locallog" into lmp-dev
Svetoslav [Fri, 3 Oct 2014 22:40:05 +0000 (15:40 -0700)]
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
Robert Greenwalt [Fri, 3 Oct 2014 23:05:36 +0000 (16:05 -0700)]
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
Jorim Jaggi [Fri, 3 Oct 2014 22:17:20 +0000 (15:17 -0700)]
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
vandwalle [Thu, 2 Oct 2014 01:28:38 +0000 (18:28 -0700)]
add millisecond timestamp to locallog
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
Jeff Sharkey [Fri, 3 Oct 2014 22:35:18 +0000 (22:35 +0000)]
Merge "More durable logging around system app upgrades." into lmp-dev
Jorim Jaggi [Fri, 3 Oct 2014 22:33:05 +0000 (22:33 +0000)]
Merge "Fix blank lockscreen #3" into lmp-dev
John Reck [Fri, 3 Oct 2014 22:22:51 +0000 (22:22 +0000)]
Merge "Cleanup DeferredLayerUpdater" into lmp-dev
Jeff Sharkey [Fri, 3 Oct 2014 22:09:14 +0000 (15:09 -0700)]
More durable logging around system app upgrades.
We've been seeing some really funky behavior when upgrading or
downgrading system apps around OTA time. Put more of these one-time
logs into durable storage to help investigate.
Bug:
17805839
Change-Id: If898d7df229c1f71e598b0d965325c272060e5e7
Adam Lesinski [Fri, 3 Oct 2014 22:17:03 +0000 (22:17 +0000)]
am
397001b2: am
a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev
* commit '
397001b2a7cb184e4916688b7ecfdcdc439be818':
AAPT: Gate v21 resource synthesizing logging behind -v flag
Vinod Krishnan [Thu, 2 Oct 2014 23:06:20 +0000 (16:06 -0700)]
System dialog looked weird on LMP
Bug:
17785416,
17473800
Change-Id: I28dff1c0f3263571ef00786b2b6935f2dd216ddf
Adam Lesinski [Fri, 3 Oct 2014 22:10:48 +0000 (22:10 +0000)]
am
a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev
* commit '
a80aba70728c2843df94474dbd7829dadb77855f':
AAPT: Gate v21 resource synthesizing logging behind -v flag
Adam Lesinski [Fri, 3 Oct 2014 22:06:02 +0000 (22:06 +0000)]
Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev
John Reck [Fri, 3 Oct 2014 22:02:19 +0000 (15:02 -0700)]
Cleanup DeferredLayerUpdater
Bug:
17765082
DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures
Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
Adam Lesinski [Fri, 3 Oct 2014 21:57:28 +0000 (14:57 -0700)]
AAPT: Gate v21 resource synthesizing logging behind -v flag
This is verbose information and should be hidden behind the -v flag.
Bug:
17822471
Change-Id: I36e2c6beb54669a31cde73416427477a80ded8a6
Elliott Hughes [Fri, 3 Oct 2014 21:42:37 +0000 (21:42 +0000)]
Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev
Svetoslav Ganov [Fri, 3 Oct 2014 21:33:16 +0000 (21:33 +0000)]
am
31deb67d: am
76716c5a: Revert "TouchExplorer computes incorrectly the click location."
* commit '
31deb67dd0c9d204bf3342b7699a240310b1cf34':
Revert "TouchExplorer computes incorrectly the click location."
Deepanshu Gupta [Fri, 3 Oct 2014 21:33:12 +0000 (21:33 +0000)]
am
c62da8a0: am
c74a2b34: Merge "Minor style changes." into lmp-dev
* commit '
c62da8a0ba8e230f2d759d2219673553999d9c56':
Minor style changes.
Dianne Hackborn [Fri, 3 Oct 2014 21:33:08 +0000 (21:33 +0000)]
am
02d758a9: am
7caa51e6: Merge "Fix issue #
17811029: Settings provider race when removing users" into lmp-dev
* commit '
02d758a9e83eb1da236f34a2a6b70af89941be43':
Fix issue #
17811029: Settings provider race when removing users
RoboErik [Fri, 3 Oct 2014 21:33:05 +0000 (21:33 +0000)]
am
2d553e95: am
7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev
* commit '
2d553e95c9e16fd37a676acaf1960e9d919c3caf':
Fix regression in RCC.editMetadata(false)
Christopher Tate [Fri, 3 Oct 2014 21:33:01 +0000 (21:33 +0000)]
am
b5c55da5: am
b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev
* commit '
b5c55da5ab7e11c2bdc5ff4ba2adadb9867d46fd':
Fix alarm delivery-order sorting
Guang Zhu [Fri, 3 Oct 2014 21:32:43 +0000 (21:32 +0000)]
am
35eb8909: am
ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev
* commit '
35eb89097f4f555dc03d4d406359a9ebfa64144d':
Prevent monkey from triggering bugreport
Dianne Hackborn [Fri, 3 Oct 2014 21:32:30 +0000 (21:32 +0000)]
am
5ebb0e6a: am
d867b7c7: Fix issue #
17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
* commit '
5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
Fix issue #
17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
Jorim Jaggi [Fri, 3 Oct 2014 21:24:55 +0000 (14:24 -0700)]
Fix blank lockscreen #3
Bug:
17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
Svetoslav Ganov [Fri, 3 Oct 2014 21:02:49 +0000 (21:02 +0000)]
am
76716c5a: Revert "TouchExplorer computes incorrectly the click location."
* commit '
76716c5a180aa471c6973ca7aa03c7f2da677823':
Revert "TouchExplorer computes incorrectly the click location."
Deepanshu Gupta [Fri, 3 Oct 2014 21:02:45 +0000 (21:02 +0000)]
am
c74a2b34: Merge "Minor style changes." into lmp-dev
* commit '
c74a2b343507546dd5b0a6be5afce42eb8b16a0d':
Minor style changes.
Dianne Hackborn [Fri, 3 Oct 2014 21:02:42 +0000 (21:02 +0000)]
am
7caa51e6: Merge "Fix issue #
17811029: Settings provider race when removing users" into lmp-dev
* commit '
7caa51e6ec6443d5c1fdb96f7e42508b074b4278':
Fix issue #
17811029: Settings provider race when removing users
RoboErik [Fri, 3 Oct 2014 21:02:38 +0000 (21:02 +0000)]
am
7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev
* commit '
7a60cdbd0989fdc262f7838b26c551a3417b7edb':
Fix regression in RCC.editMetadata(false)
Christopher Tate [Fri, 3 Oct 2014 21:02:32 +0000 (21:02 +0000)]
am
b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev
* commit '
b88ba912f6bb2fd0ae16794470cce38ee308b6ea':
Fix alarm delivery-order sorting
Svetoslav Ganov [Fri, 3 Oct 2014 20:34:37 +0000 (20:34 +0000)]
Revert "TouchExplorer computes incorrectly the click location."
This reverts commit
851a5059a47cbf76e530c9d050a677cb6e3f8657 as
it creates a regression. Let us revert this and correctly fix the
issue the original change was trying to address.
bug:
17789608
Change-Id: I8abb1a61d5310430e839e4ef60e7ca5cc0cbdd80
Deepanshu Gupta [Fri, 3 Oct 2014 20:30:43 +0000 (20:30 +0000)]
Merge "Minor style changes." into lmp-dev
Dianne Hackborn [Fri, 3 Oct 2014 20:15:11 +0000 (20:15 +0000)]
Merge "Fix issue #
17811029: Settings provider race when removing users" into lmp-dev
RoboErik [Fri, 3 Oct 2014 20:13:27 +0000 (20:13 +0000)]
Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev