OSDN Git Service
Yorke Lee [Tue, 7 Oct 2014 00:58:40 +0000 (00:58 +0000)]
am
4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '
4c334f3def076d2940b53641c932050b1e4ce286':
Add ability to add sim-initiated MO call to UI (2/4)
Yorke Lee [Tue, 7 Oct 2014 00:54:51 +0000 (00:54 +0000)]
Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
Jeff Sharkey [Mon, 6 Oct 2014 23:56:41 +0000 (23:56 +0000)]
am
99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
* commit '
99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
Jeff Sharkey [Mon, 6 Oct 2014 23:51:52 +0000 (23:51 +0000)]
Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
Jeff Sharkey [Mon, 6 Oct 2014 22:14:27 +0000 (15:14 -0700)]
Reduce PackageInstaller I/O pressure.
When performing a restore during initial device setup, we could be
installing hundreds of packages. Currently, we're writing all
metadata (including heavy icons) for every session mutation! Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.
This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.
Bug:
17881962,
17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
Geoff Mendal [Mon, 6 Oct 2014 23:35:09 +0000 (23:35 +0000)]
am
fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
fc8d65197a6404a93f1230ac5ebc635438a5c094':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 23:28:18 +0000 (23:28 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Raluca Sauciuc [Mon, 6 Oct 2014 23:22:26 +0000 (23:22 +0000)]
am
6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
* commit '
6a3faf5a8b182d20dea47fb76cf33456321ddf7a':
Fix test framework to allow Mockito tests to run successfully on ART.
Raluca Sauciuc [Mon, 6 Oct 2014 23:19:11 +0000 (23:19 +0000)]
Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
Paul Jensen [Mon, 6 Oct 2014 23:06:48 +0000 (23:06 +0000)]
am
7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
* commit '
7627d2cd5cd93ebf8e683392edbef961dbc20d31':
Use network-specific HTTP proxy settings in captive portal login app.
Paul Jensen [Mon, 6 Oct 2014 23:01:26 +0000 (23:01 +0000)]
Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
Chris Craik [Mon, 6 Oct 2014 22:34:31 +0000 (22:34 +0000)]
am
6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
* commit '
6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
Mike Lockwood [Mon, 6 Oct 2014 22:34:27 +0000 (22:34 +0000)]
am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
Add support for playing audio during bootanimation
Mathieu Chartier [Mon, 6 Oct 2014 22:34:23 +0000 (22:34 +0000)]
am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
Fix incorrect JNI_ABORT
Yorke Lee [Thu, 2 Oct 2014 16:38:39 +0000 (09:38 -0700)]
Add ability to add sim-initiated MO call to UI (2/4)
Add supporting (hidden) APIs to TelecomManager to add the ability to
add a previous unknown call to Telecom
Bug:
17787391
Change-Id: Ibdfaee81a55e11451c146751cf970980dccad435
Chris Craik [Mon, 6 Oct 2014 22:06:22 +0000 (22:06 +0000)]
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 21:55:42 +0000 (14:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4bd44e7036f41df58740596f560091ef40c1f23
Auto-generated-cl: translation import
Chris Craik [Mon, 6 Oct 2014 21:50:59 +0000 (14:50 -0700)]
Avoid changeBounds animations on Views that are not yet laidout
bug:
17683930
This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.
Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
Mike Lockwood [Mon, 6 Oct 2014 20:50:18 +0000 (20:50 +0000)]
Merge "Add support for playing audio during bootanimation" into lmp-dev
Mathieu Chartier [Mon, 6 Oct 2014 20:27:07 +0000 (20:27 +0000)]
Merge "Fix incorrect JNI_ABORT" into lmp-dev
Mathieu Chartier [Mon, 6 Oct 2014 19:42:00 +0000 (12:42 -0700)]
Fix incorrect JNI_ABORT
If there is a copy, JNI_ABORT does NOT copy back into the
corresponding java array. Changing this to 0 is what you want since
this will copy the data back if needed and free the temporary
storage.
Bug:
16858794
Change-Id: I3f3b426ea3cbba577bb720532c16ebf7493f1c1c
Amit Mahajan [Mon, 6 Oct 2014 19:23:39 +0000 (19:23 +0000)]
am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
17d7c79650664c7a112ab175cb2329d2062f4d1e':
ATT: Call does not establish to '*1'
Amit Mahajan [Mon, 6 Oct 2014 19:17:05 +0000 (19:17 +0000)]
Merge "ATT: Call does not establish to '*1'" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:15:58 +0000 (19:15 +0000)]
am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
712363889899bfff564a39ef4d88ff048a9e5ec7':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:15:53 +0000 (19:15 +0000)]
am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
bbebe42309a7012e0474b916f5209027889e8d57':
adb backup/restore fixes
Geoff Mendal [Mon, 6 Oct 2014 19:10:24 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Christopher Tate [Mon, 6 Oct 2014 19:09:11 +0000 (19:09 +0000)]
Merge "adb backup/restore fixes" into lmp-dev
Bing Gao [Fri, 3 Oct 2014 19:56:04 +0000 (12:56 -0700)]
ATT: Call does not establish to '*1'
Bug:
17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
Dianne Hackborn [Mon, 6 Oct 2014 18:58:57 +0000 (18:58 +0000)]
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
Dianne Hackborn [Mon, 6 Oct 2014 18:48:33 +0000 (18:48 +0000)]
Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 18:36:32 +0000 (18:36 +0000)]
am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:34:20 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:32:18 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
John Spurlock [Mon, 6 Oct 2014 18:00:09 +0000 (18:00 +0000)]
am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 17:55:05 +0000 (17:55 +0000)]
am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
2dd86d50ae19efa071d83e02545b2767c351fdd6':
Removed preview license.
John Spurlock [Mon, 6 Oct 2014 17:54:40 +0000 (17:54 +0000)]
Merge "Fix NPE in StrictMode handling." into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:54:01 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
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
John Spurlock [Mon, 6 Oct 2014 16:36:45 +0000 (12:36 -0400)]
Fix NPE in StrictMode handling.
Bug:
17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
Yuncheol Heo [Mon, 6 Oct 2014 16:21:30 +0000 (16:21 +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:08:51 +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
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 17:59:00 +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:53:14 +0000 (17:53 +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:49:44 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 5 Oct 2014 17:44:57 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Jeff Sharkey [Sun, 5 Oct 2014 01:22:22 +0000 (01:22 +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: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 18:36:29 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8ff929363bf25f7a8971563db3fc39225016faa
Auto-generated-cl: translation import
Christopher Tate [Sat, 4 Oct 2014 01:26:29 +0000 (18:26 -0700)]
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
Jorim Jaggi [Sat, 4 Oct 2014 00:03:12 +0000 (00:03 +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:34 +0000 (23:57 +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:57:30 +0000 (23:57 +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:57:26 +0000 (23:57 +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:57:21 +0000 (23:57 +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:57:17 +0000 (23:57 +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:57:13 +0000 (23:57 +0000)]
am
f009e358: Merge "Fix blank lockscreen #3" into lmp-dev
* commit '
f009e3583f2843a463d75f06675ef18c398b0efd':
Fix blank lockscreen #3
John Reck [Fri, 3 Oct 2014 23:57:09 +0000 (23:57 +0000)]
am
d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
* commit '
d988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
Jorim Jaggi [Fri, 3 Oct 2014 23:54:06 +0000 (23:54 +0000)]
Merge "Fix blank Keyguard #4" into lmp-dev
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
Dianne Hackborn [Fri, 3 Oct 2014 23:26:04 +0000 (16:26 -0700)]
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
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
Mike Lockwood [Thu, 2 Oct 2014 23:08:47 +0000 (16:08 -0700)]
Add support for playing audio during bootanimation
The bootanimation daemon will play 16 bit WAV files contained in bootanimation.zip
For this to work, the bootanimation.zip must contain an audio_conf.txt file,
which contains parameters to be used for the tinyalsa pcm_open call
as well as mixer parameters to set before attempting to play the sound.
If the bootanimation finds an audio_conf.txt file, then it will look for a file named
"audio.wav" in each of the part subdirectories. If audio.wav is found, it will play that
WAV file starting at the beginning of that part.
The code for this is based on the tinyplay utility in tinyalsa.
The audio_conf.txt and must begin with the following header:
card=<ALSA card number>
device=<ALSA device number>
period_size=<period size>
period_count=<period count>
This header is followed by zero or more mixer settings, each with the format:
mixer "<name>" = <value list>
Since mixer names can contain spaces, the name must be enclosed in double quotes.
The values in the value list can be integers, booleans (represented by 0 or 1)
or strings for enum values.
Finally I should mention that this change is not the right approach.
Instead of going straight to ALSA we should be using the mediaserver instead.
But mediaserver isn't ready in time due to interactions with the system server, and there
isn't time to fix this for the current release. We need to fix that for the next one.
Bug:
17674304
Change-Id: Ic391ade61c941d0a24f4d64fe005ac9375a23fa9
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:12:16 +0000 (22:12 +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
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:03:03 +0000 (21:03 +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:59 +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:55 +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:51 +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:46 +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
Christopher Tate [Fri, 3 Oct 2014 19:56:35 +0000 (19:56 +0000)]
Merge "Fix alarm delivery-order sorting" into lmp-dev
RoboErik [Fri, 3 Oct 2014 19:45:58 +0000 (12:45 -0700)]
Fix regression in RCC.editMetadata(false)
Found a very simple fix. Just set the cached metadata so we have
it to copy over when editMetadata(false) is called.
bug:
17796693
Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
Guang Zhu [Fri, 3 Oct 2014 19:45:46 +0000 (19:45 +0000)]
am
ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev
* commit '
ba5df0d01970ec97d64397d9db55f8d1ad98aa16':
Prevent monkey from triggering bugreport
Guang Zhu [Fri, 3 Oct 2014 19:38:36 +0000 (19:38 +0000)]
Merge "Prevent monkey from triggering bugreport" into lmp-dev
Christopher Tate [Fri, 3 Oct 2014 00:27:57 +0000 (17:27 -0700)]
Fix alarm delivery-order sorting
We also refine the order of delivery within any given package. Now,
we identify which apps have wakeup alarms being delivered in the
current pass, and deliver all of that app's alarms before moving
on to alarm delivery to apps who are only receiving non-wakeup alarms
in the current delivery pass. The TIME_TICK alarm is also hoisted to
the start of the current delivery pass if present.
Bug
17778686
Change-Id: I6306a00fe657787a77d0254c0807ac51e810fdcf
Dianne Hackborn [Fri, 3 Oct 2014 19:29:43 +0000 (12:29 -0700)]
Fix issue #
17811029: Settings provider race when removing users
Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
Guang Zhu [Fri, 3 Oct 2014 19:23:43 +0000 (12:23 -0700)]
Prevent monkey from triggering bugreport
Change-Id: Ifa6f06f7dfa63b740352ad7388f33911649afcb0