OSDN Git Service
Christoph Studer [Thu, 25 Sep 2014 10:53:46 +0000 (10:53 +0000)]
Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
Ronghua Wu [Thu, 25 Sep 2014 00:23:02 +0000 (00:23 +0000)]
Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
Sukanya Rajkhowa [Mon, 15 Sep 2014 22:59:38 +0000 (15:59 -0700)]
Add config to control phone switch
When UNSOL_RADIO_TECH_CHANGED is received, PhoneProxy
calls updatePhoneObject to decide whether to do a phone
switch. This config determines whether to also do a
phone switch when VOICE_REGISTRATION_STATE changes. Default
value is true
Bug:
17394282
Change-Id: Iae6c35992b932923d74c405d443b1e7e98f750c8
Lajos Molnar [Thu, 25 Sep 2014 00:19:43 +0000 (00:19 +0000)]
Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev
Ronghua Wu [Wed, 24 Sep 2014 17:00:48 +0000 (10:00 -0700)]
MediaCodecList: fix findEncoderForFormat.
Bug:
17460057
Bug:
17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
Andre Eisenbach [Wed, 24 Sep 2014 23:57:01 +0000 (23:57 +0000)]
Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
Vinit Deshpande [Wed, 24 Sep 2014 23:50:04 +0000 (23:50 +0000)]
Merge "Introduce config setting for scanning mac OUI" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 21:07:35 +0000 (14:07 -0700)]
MediaCodec: revalidate cached queued input buffers if queue fails (2)
Handle the other ways queueBuffer can fail. Revalidate the buffers
properly, e.g. without clearing them.
Bug:
17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
Lajos Molnar [Wed, 24 Sep 2014 23:40:55 +0000 (23:40 +0000)]
Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 23:27:24 +0000 (23:27 +0000)]
Merge "Include reason when wiping data." into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:32 +0000 (23:07 +0000)]
Merge "Add one more test and update old tests" into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:17 +0000 (23:07 +0000)]
Merge "Fix AVD for CTS failure." into lmp-dev
Ruben Brunk [Wed, 24 Sep 2014 22:51:54 +0000 (22:51 +0000)]
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
Prerepa Viswanadham [Fri, 19 Sep 2014 17:57:54 +0000 (10:57 -0700)]
Remove remanents of onConnectionCongested in framwork
Bug:
17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
Joe Fernandez [Wed, 24 Sep 2014 21:54:08 +0000 (21:54 +0000)]
am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
RoboErik [Wed, 24 Sep 2014 21:35:55 +0000 (21:35 +0000)]
Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
Amith Yamasani [Wed, 24 Sep 2014 21:28:41 +0000 (21:28 +0000)]
Merge "Return masked location mode for managed profiles" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 21:07:35 +0000 (14:07 -0700)]
MediaCodec: revalidate cached queued input buffers if queue fails
For legacy behavior (using getInputBuffers) input buffer needs to
be made valid if queue fails. Otherwise, it becomes unusable,
and the buffer still belongs to the user.
In the new model, buffers obtained by getIn/OutputBuffer will
become invalid even if queue/release fails.
We do not do the same logic for output buffers, as these should
not be accessed even if releaseBuffer fails (which really should not
happen anyway unless codec is in bad state).
Bug:
17630446
Change-Id: Ica72a168d8aea97a0ee3f3ef49c60d0ca5a9fa06
Dianne Hackborn [Wed, 24 Sep 2014 21:06:46 +0000 (21:06 +0000)]
Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
Igor Murashkin [Wed, 24 Sep 2014 20:58:18 +0000 (20:58 +0000)]
Merge "camera2: Increase preview frame timeout" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 18:45:24 +0000 (11:45 -0700)]
Include reason when wiping data.
This will help us track down who requested a data wipe.
Bug:
17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
Igor Murashkin [Wed, 24 Sep 2014 20:48:09 +0000 (13:48 -0700)]
camera2: Increase preview frame timeout
Some devices, especially those with HAL2/HAL3 frames will have a large
delay between the first preview frame and and the camera open. This is
because the streams are configured lazily so it adds extra latency.
Increase the timeout to make it significantly less likely to get frame drops.
Bug:
17628866
Change-Id: I48dcda8507fb7eb31c3f426f833418126171c204
Dianne Hackborn [Wed, 24 Sep 2014 20:44:17 +0000 (20:44 +0000)]
Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
Svetoslav [Wed, 24 Sep 2014 20:29:46 +0000 (20:29 +0000)]
Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
Svetoslav [Wed, 24 Sep 2014 20:19:49 +0000 (13:19 -0700)]
Print spooler should not crash if fed non-PDF content.
It is possible that a buggy app breaks the contract and provides
content to be printed in format other than PDF. This was leading
to a crash in the print spooler. This change fixes the crash and
shows a user friendly error message.
bug:
17642690
Change-Id: I5a4acb06080a152562655da6851467b3e71d8658
Derek Sollenberger [Wed, 24 Sep 2014 20:21:53 +0000 (20:21 +0000)]
Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
Dianne Hackborn [Wed, 24 Sep 2014 19:44:29 +0000 (12:44 -0700)]
Fix issue #
17614141: Add protection for accessing images
Add basic filename protection, also only file names that are for
app icons so this can't be abused to access thumbnails.
Change-Id: I2831c0f3f08a39aa734f93f76b6fd4aaf97e87c6
Mathieu Chartier [Wed, 24 Sep 2014 19:30:37 +0000 (19:30 +0000)]
Merge "Fix dalvik map names" into lmp-dev
Amith Yamasani [Tue, 23 Sep 2014 18:32:34 +0000 (11:32 -0700)]
Return masked location mode for managed profiles
If there's a user restriction on location sharing in a
managed profile, always return empty string for location
providers so that location can be disabled by the admin
even if the primary user has location enabled.
Also fix an incorrect update of the cache. Shouldn't update
the primary user's cache when the caller is the managed profile.
Bug:
17478855
Change-Id: Icab3459ae351c5cfc287e21df6a5ba1df9dfbdb4
Mathieu Chartier [Wed, 24 Sep 2014 00:24:30 +0000 (17:24 -0700)]
Fix dalvik map names
Some maps which should have been dalvik other were incorrectly
accounted for in dalvik heap.
Bug:
17632563
Change-Id: I90d0bebf700650a445b19c4c72674b2941868d8b
Chet Haase [Wed, 24 Sep 2014 18:31:04 +0000 (18:31 +0000)]
Merge "Avoid drawing the starting window twice" into lmp-dev
Dianne Hackborn [Wed, 24 Sep 2014 17:56:28 +0000 (10:56 -0700)]
Work on issue #
17624121: Settings crash while launching on wiped device
Cleaner paths and better error reporting when a problem goes wrong
while binding an application. This gets rid of the (recently added)
error about removing a process that hasn't been killed, and cleanly
kills the process along with more detailed errors about where things
failed.
Change-Id: I710a209c14da1515929e6254396b793177eee115
Ruben Brunk [Wed, 24 Sep 2014 17:54:16 +0000 (17:54 +0000)]
Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
Baligh Uddin [Wed, 24 Sep 2014 17:49:30 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Wed, 24 Sep 2014 17:44:03 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Ruben Brunk [Wed, 24 Sep 2014 06:35:43 +0000 (23:35 -0700)]
camera2: Hide JPEGs in RGBA gralloc buffers.
Bug:
17379185
- WAR for SW Write usage flags being unavailable on
certain devices for JPEG (blob) format buffers.
Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
Dianne Hackborn [Wed, 24 Sep 2014 17:17:39 +0000 (17:17 +0000)]
Merge "Fix issue #
17632804: Add resource padding" into lmp-dev
Robin Lee [Wed, 24 Sep 2014 17:03:32 +0000 (17:03 +0000)]
Merge "Reset keystore when user is added or removed" into lmp-dev
Adrian Roos [Wed, 24 Sep 2014 16:46:20 +0000 (16:46 +0000)]
Merge "Fix ColorInversionTile for secondary users" into lmp-dev
RoboErik [Wed, 24 Sep 2014 16:24:54 +0000 (09:24 -0700)]
Clear the volume cache for all inactive state transitions
bug:
16988480
Change-Id: I0426c76681f8ec832c3f72842ee494d286050fea
Joe Fernandez [Wed, 24 Sep 2014 15:56:02 +0000 (15:56 +0000)]
am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
1968b91937020e8aa826224642733bbb9055af2e':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Joe Fernandez [Wed, 24 Sep 2014 15:44:50 +0000 (15:44 +0000)]
am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
b8a60dada505d79341cfa4cc2b9906d892e8298b':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Joe Fernandez [Wed, 24 Sep 2014 15:39:01 +0000 (15:39 +0000)]
Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
Joe Fernandez [Fri, 19 Sep 2014 17:11:34 +0000 (10:11 -0700)]
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
Svetoslav [Wed, 24 Sep 2014 15:24:24 +0000 (15:24 +0000)]
Merge "Missing pages in print preview when scorolling." into lmp-dev
Svetoslav [Wed, 24 Sep 2014 15:23:59 +0000 (15:23 +0000)]
Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
Adrian Roos [Wed, 24 Sep 2014 15:08:22 +0000 (17:08 +0200)]
Fix ColorInversionTile for secondary users
Bug:
17626692
Change-Id: I40354a460a7c00f6fd5eb05f7836dc89129fdacb
Jason Monk [Wed, 24 Sep 2014 14:57:23 +0000 (14:57 +0000)]
Merge "Add announcement of global actions dialog" into lmp-dev
Jason Monk [Wed, 24 Sep 2014 14:50:03 +0000 (14:50 +0000)]
Merge "Fix accessibility announcement for QS details" into lmp-dev
Chet Haase [Wed, 24 Sep 2014 14:31:29 +0000 (07:31 -0700)]
Avoid drawing the starting window twice
Logic in WindowState caused a delayed layout on the starting window,
which forced another layout/draw pass, which was unnecessary. Making
the resize call happen sooner means that that request gets lumped in
with a pending layout request, so there's only one resulting draw.
This saves not only the second drawing operation, but also the creation
of an extra buffer in SurfaceFlinger for that second draw request. This
buffer is temporary, but can be quite large on some devices and push
the system over the memory edge in extreme situations. It's difficult
to track this memory usage difference as the buffer resides at a very
low level in the system. But you can see in systrace that the second
allocation (and the second draw) is not happening after the fix.
Issue #
17570761 Constrain starting window to only one buffer
Change-Id: I0e0fff7efdc812730706afccbfb020dea3f8d3e2
Derek Sollenberger [Wed, 24 Sep 2014 13:20:09 +0000 (09:20 -0400)]
Fix memory leak where we close the descriptor instead of the file.
bug:
17541634
Change-Id: I842176213e0547dd737ef6e0b83c320a5cc32219
Christoph Studer [Tue, 23 Sep 2014 17:08:56 +0000 (19:08 +0200)]
NoMan: Add 3s timeout in matchesCallFilter()
In Priority mode, NoMan can block the telecom Ringer
indefinitely when looking up the caller contact details via
ContactsProvider.
Fix this by introducing a 3s timeout and assume the call
matches the call filter when the timeout is hit.
Bug:
17598245
Change-Id: Ia0893cf203e6ffd943c749719ebb9e0f0958eb01
Jason Monk [Tue, 23 Sep 2014 13:09:52 +0000 (09:09 -0400)]
Add announcement of global actions dialog
Rather than saying 'Alert', say 'Alert, ...' describing the contents
of the menu.
Bug:
17559783
Change-Id: I43b1b5ba9ce76b8c205f2d29f2f8ee7569517c19
Robin Lee [Tue, 23 Sep 2014 12:50:22 +0000 (13:50 +0100)]
Reset keystore when user is added or removed
Because user IDs are recycled it is not safe to leave this kind of
information around after deleting.
Bug:
17403144
Change-Id: I441f85750cf8818adaf62a1acdb2ba7b4bfc1b7e
Zoltan Szatmary-Ban [Wed, 24 Sep 2014 09:41:17 +0000 (09:41 +0000)]
Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
Ruben Brunk [Wed, 2 Jul 2014 18:05:08 +0000 (11:05 -0700)]
camera2: Update CamcorderProfile documentation.
Bug:
17447258
- Update documentation in CamcorderProfile for LEGACY
mode video handling.
Change-Id: If65b93788a38ffe28caec053f81b9afa538c38a0
Svetoslav [Wed, 24 Sep 2014 04:19:04 +0000 (21:19 -0700)]
Missing pages in print preview when scorolling.
It is possible that two providers for the same page are assigned
to two preview views despite temporariliy while rebinding. We were
however releasing the provider from the view which is being bound
if not for the same page which as a result was cancelling rendering
of this page which is provided to another view via another provider.
Hence, having an empty page. Removed the unnecessary code to release
a provider when binding the view - release is happening only if the
view holder is recycled.
bug:
17515670
Change-Id: I197438c16cfdb363f521cd1320f154da54eea5f5
Tsuwei Chen [Wed, 24 Sep 2014 01:53:30 +0000 (01:53 +0000)]
Merge "Use the right format to specify SUPL_MODE value." into lmp-dev
Svetoslav [Wed, 24 Sep 2014 01:48:18 +0000 (18:48 -0700)]
Ignore not visible views computing click point for accessibility.
In accessibility mode we compute a location to where to send down and up
events to click a view (triggered by a double tap). This solves the problem
of interacting with views that are partially covered by other interactive
views. The logic that computes the click point was not ignoring siblings
that are not visible. As a result a blind user cannot interact with some
views.
bug:
17632224
Change-Id: I93e637ee6702e4ba3e79faa736205430e2196d01
Craig Mautner [Wed, 24 Sep 2014 01:43:01 +0000 (01:43 +0000)]
Merge "Force layout and animation when display changes" into lmp-dev
Eric Laurent [Wed, 24 Sep 2014 01:39:33 +0000 (01:39 +0000)]
Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
Craig Mautner [Wed, 24 Sep 2014 01:37:49 +0000 (18:37 -0700)]
Force layout and animation when display changes
Each time that window manager gets a notification that a display has
been added, removed or changed, run a pass through
performLayoutAndPlaceSurfaces. This ensures that
WindowAnimator.animate() runs once so that the surfaces of remote
displays can be updated with their visibility.
Fixes bug
17533991.
Change-Id: If8745527df86c74da75fbe26b8a2a6fddeb74d2a
Dianne Hackborn [Wed, 24 Sep 2014 01:32:39 +0000 (18:32 -0700)]
Fix issue #
17632804: Add resource padding
Change-Id: If09108415fc4f64f4d4ff837a6096713a96aa334
Tsuwei Chen [Wed, 24 Sep 2014 01:29:37 +0000 (18:29 -0700)]
Use the right format to specify SUPL_MODE value.
Bug:
17618140
Change-Id: I013219bb8febb4bb5c23d4896f432fd3a01c21f8
Lorenzo Colitti [Wed, 24 Sep 2014 01:21:08 +0000 (01:21 +0000)]
Merge "Only stop/start clatd if necessary." into lmp-dev
Lorenzo Colitti [Wed, 24 Sep 2014 01:21:04 +0000 (01:21 +0000)]
Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
Alan Viverette [Wed, 24 Sep 2014 01:17:52 +0000 (01:17 +0000)]
Merge "Explicitly set Settings background to white" into lmp-dev
Alan Viverette [Wed, 24 Sep 2014 01:15:31 +0000 (18:15 -0700)]
Explicitly set Settings background to white
Fixes a regression where the background was previously the default
color, then changed to #eee even though we still want #fff here.
Removes unnecessary windowBackground re-definition.
BUG:
17520824
Change-Id: I9b3a751ce55fc018a90132078a8e308067f62445
Dianne Hackborn [Wed, 24 Sep 2014 01:00:02 +0000 (01:00 +0000)]
Merge "Work on issue #
17628623: Need to update default preferred activities for YouTube" into lmp-dev
Matthew Williams [Wed, 24 Sep 2014 00:58:54 +0000 (00:58 +0000)]
Merge "Fix lock ordering in JobScheduler" into lmp-dev
Matthew Williams [Tue, 23 Sep 2014 20:39:36 +0000 (13:39 -0700)]
Fix lock ordering in JobScheduler
BUG:
17625667
Two part clean-up.
1) Don't try to lock in onControllerStateChanged. Do it in the handleMessage
instead where the rest of the locking is. This is sufficient to fix this bug.
2) The other side of the deadlock came b/c we lock when cancelling and calling
stopTrackingJob. Controllers handle their own locking so this isn't
necessary. B/c of a potential race from the controller side, added an explicit
check for the JSS to only run an expired job if it still exists.
Change-Id: Iaeebbc19437eb5b73e3ced3168f1fc13e564a4be
Jeff Sharkey [Tue, 23 Sep 2014 23:58:50 +0000 (23:58 +0000)]
Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
Svetoslav [Tue, 23 Sep 2014 23:53:21 +0000 (23:53 +0000)]
Merge "Fix ANR in print spooler." into lmp-dev
Svetoslav [Tue, 23 Sep 2014 23:52:58 +0000 (23:52 +0000)]
Merge "Print spooler crash on back before first layout is complete." into lmp-dev
Dianne Hackborn [Tue, 23 Sep 2014 23:45:39 +0000 (16:45 -0700)]
Work on issue #
17628623: Need to update default preferred activities for YouTube
Improve the warning logs when setting up preferred activities
to help identify when there are issues and what they are. Also
improve the algorithm a little to still apply permissions when
resetting them and there are additional third party apps, as long
as the additional app is something like another browser and the
preferred activity being set is more specific (has a better match).
And add an example of using manifest-based preferred activities
in to ActivityTest -- and yes it DOES work! :p
Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
Jeff Sharkey [Tue, 23 Sep 2014 23:40:50 +0000 (16:40 -0700)]
More ACTION_CHOOSER ClipData migration.
Traverse into both EXTRA_INTENT and any EXTRA_INITIAL_INTENTS when
migrating extras to ClipData. Also, we don't need to promote these
ClipData into the parent, since the platform ChooserActivity will
issue any required permission grants for the final user-selected
Intent. Even if we wanted to, we can't combine the various child
Intent flags into anything meaningful at the ACTION_CHOOSER level.
Bug:
17580604
Change-Id: I6b5a1f572a7edf8135e059c67a2643d3736e40ab
ztenghui [Tue, 23 Sep 2014 23:35:05 +0000 (16:35 -0700)]
Add one more test and update old tests
This is just updating the internal test app.
No real functionality changed.
b/
17631551
Change-Id: Icc01e017ea4fbf97712214e6ac02691d29ea5e96
Michael Wright [Tue, 23 Sep 2014 23:35:19 +0000 (23:35 +0000)]
Merge "Add keylayout for Asus Gamepad" into lmp-dev
Svetoslav [Tue, 23 Sep 2014 23:22:42 +0000 (16:22 -0700)]
Fix ANR in print spooler.
Saving to PDF a subset of the pages requires trimming the
undesired pages and when this is done writing the ready doc
to a URI. To write the file to URI we have to obtain it but
it is aquired by the shredding task and never released. Now
we are releasing the document immediately after trimming it.
bug:
17631301
Change-Id: I4db7966c65c75f0f14c3cb52fd83b4d8fd5a4687
ztenghui [Tue, 23 Sep 2014 18:12:43 +0000 (11:12 -0700)]
Fix AVD for CTS failure.
Mostly about changingConfig flags, the fix is just a copy from VectorDrawable.
b/
17631551
Change-Id: Ibad9c2f61cd86b15e9bca1d1991c8cd147897bb0
Michael Wright [Tue, 23 Sep 2014 22:56:17 +0000 (15:56 -0700)]
Add keylayout for Asus Gamepad
Bug:
17627642
Change-Id: I9dd76bbc3ea0493d5a54479ef4dc94c520e35433
Svetoslav [Tue, 23 Sep 2014 22:27:35 +0000 (15:27 -0700)]
Print spooler crash on back before first layout is complete.
If the user presses back before the remote print document
update has completed we get a crash. The reason is that
after the update completion we were trying to finish the
activity if we are in a cancelled state but this is not
needed as we aready handled the back key so we will finish.
Handling finish twice was creating the problem as classes
with lifecycles are not designed to be used after being
finished. In particular, we were calling doFinish() twice.
bug:
17630561
Change-Id: If418f237a2def7c8e4a072ac8826283f4dd7fc85
Igor Murashkin [Tue, 23 Sep 2014 22:50:29 +0000 (22:50 +0000)]
Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
vandwalle [Tue, 23 Sep 2014 22:31:33 +0000 (22:31 +0000)]
Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
Igor Murashkin [Tue, 23 Sep 2014 22:11:36 +0000 (15:11 -0700)]
camera2-legacy: Workaround max jpeg/preview size AR mismatch
Filter out the largest preview sizes (from the stream configuration map)
until we find one whose aspect ratio matches the max jpeg aspect ratio.
Keep all other (smaller) preview sizes.
Bug:
17589233
Change-Id: I8ebcaef6439691eff3312da2c37b9abe08a067ad
Jeff Brown [Tue, 23 Sep 2014 21:02:42 +0000 (21:02 +0000)]
Merge "Move setting the display state out of the critical section." into lmp-dev
Jay Shrauner [Tue, 23 Sep 2014 20:59:14 +0000 (20:59 +0000)]
Merge "Fix NPE crash when mPhone is null" into lmp-dev
Dianne Hackborn [Tue, 23 Sep 2014 20:55:04 +0000 (20:55 +0000)]
Merge "Maybe fix issue #
17614177 APR: system process restarting due to infinite loop" into lmp-dev
Adam Powell [Tue, 23 Sep 2014 20:46:45 +0000 (20:46 +0000)]
Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
Jeff Brown [Thu, 18 Sep 2014 22:24:49 +0000 (15:24 -0700)]
Move setting the display state out of the critical section.
Setting the display power state currently happens while holding the
display manager lock. This change moves it out of the lock to
ensure other services don't get stuck for several hundred
milliseconds.
Unfortunately, surface flinger ends up stalled a little later
so this only solves part of the problem.
Bug:
17623774
Change-Id: I201137c5e7f82c776f28a436845fcf3191fd0ca5
John Spurlock [Tue, 23 Sep 2014 20:08:12 +0000 (20:08 +0000)]
Merge "Remove redundant wifi-display notification." into lmp-dev
John Spurlock [Tue, 23 Sep 2014 19:51:11 +0000 (15:51 -0400)]
Remove redundant wifi-display notification.
Since all devices now appear in quick settings, remove the
framework notification and obsolete artifacts.
Bug:
17607193
Change-Id: If952b826d79c77068285373c6b44a430f78c20b1
Dianne Hackborn [Tue, 23 Sep 2014 19:49:59 +0000 (19:49 +0000)]
Merge "Fix issue #
17307700: retarget a relinquished task is not working" into lmp-dev
Vinit Deshpande [Mon, 22 Sep 2014 22:25:57 +0000 (15:25 -0700)]
Introduce config setting for scanning mac OUI
This setting will allow an OEMs to override the default Google OUI
for scanning.
Bug:
17468465
Change-Id: I3d9a6cf6451bcc98d0cad158bc52c7b3a52cb0ea
Jason Monk [Tue, 23 Sep 2014 19:42:24 +0000 (19:42 +0000)]
Merge "Add missing permission for hotspot QS tile" into lmp-dev
vandwalle [Fri, 19 Sep 2014 22:21:35 +0000 (15:21 -0700)]
handle bssid blacklist in case of dhcp failures
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
Selim Cinek [Tue, 23 Sep 2014 19:28:11 +0000 (19:28 +0000)]
Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
ztenghui [Tue, 23 Sep 2014 19:26:40 +0000 (19:26 +0000)]
Merge "Fix animation on the some properties" into lmp-dev
Tsuwei Chen [Tue, 23 Sep 2014 18:54:02 +0000 (18:54 +0000)]
Merge "Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set." into lmp-dev
Selim Cinek [Tue, 23 Sep 2014 18:44:35 +0000 (20:44 +0200)]
Enforcing falsing-threshold on touch when using AoD
Also increased the threshold by a factor of 1.5 if
we are waking up due to a touch.
Bug:
17350239
Change-Id: Ida8bad234b3815abf80ca57f8004f3bc5df003cd