OSDN Git Service
Dianne Hackborn [Wed, 24 Sep 2014 21:12:58 +0000 (21:12 +0000)]
am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
2a857c633ddf2cdb02c768f9340ecb5abe468c48':
Work on issue #
17624121: Settings crash while launching on wiped device
Igor Murashkin [Wed, 24 Sep 2014 21:07:24 +0000 (21:07 +0000)]
am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
7ddc2313a35637f087b68fea385df9d56b7f3f6d':
camera2: Increase preview frame timeout
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
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:51:16 +0000 (20:51 +0000)]
am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
5576641a9709a03df5f4e45ac91ff94fa5b1bb18':
Fix issue #
17614141: Add protection for accessing images
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:33:54 +0000 (20:33 +0000)]
am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
299a89b50f1268f3c4cd0e58727f7d7805b573b2':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 20:33:50 +0000 (20:33 +0000)]
am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
c37e905a245e3134a417677b93d5a020bab62d75':
Fix memory leak where we close the descriptor instead of the file.
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:39:11 +0000 (19:39 +0000)]
am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
a061388d3f230072661c55fcb4158f383fd9fe94':
Fix dalvik map names
Mathieu Chartier [Wed, 24 Sep 2014 19:30:37 +0000 (19:30 +0000)]
Merge "Fix dalvik map names" into lmp-dev
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:41:06 +0000 (18:41 +0000)]
am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
66287788d35687a140df10ac96646cdf04f91a88':
Avoid drawing the starting window twice
Chet Haase [Wed, 24 Sep 2014 18:31:04 +0000 (18:31 +0000)]
Merge "Avoid drawing the starting window twice" into lmp-dev
Ruben Brunk [Wed, 24 Sep 2014 17:58:35 +0000 (17:58 +0000)]
am
e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
* commit '
e9858c6a5aefe2aec45a89204fab34246ff4448a':
camera2: Update CamcorderProfile documentation.
Baligh Uddin [Wed, 24 Sep 2014 17:58:31 +0000 (17:58 +0000)]
am
0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
0f77230ab52f2a991dadc142bcc533093c55e463':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 17:58:27 +0000 (17:58 +0000)]
am
5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
5de699d1bc625e81f19c1c50916f8666f2da76da':
Import translations. DO NOT MERGE
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:49:08 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Wed, 24 Sep 2014 17:44:03 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Wed, 24 Sep 2014 17:43:57 +0000 (17:43 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Dianne Hackborn [Wed, 24 Sep 2014 17:30:02 +0000 (17:30 +0000)]
am
c0e5eb2b: Merge "Fix issue #
17632804: Add resource padding" into lmp-dev
* commit '
c0e5eb2b4310b14bbf1829ce4516084462e9cf8b':
Fix issue #
17632804: Add resource padding
Robin Lee [Wed, 24 Sep 2014 17:20:26 +0000 (17:20 +0000)]
am
0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev
* commit '
0a803fcc2a000985a42072db5b4c9d4917139fcf':
Reset keystore when user is added or removed
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:59:10 +0000 (16:59 +0000)]
am
291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev
* commit '
291d6e0f59f479b8d451293e72a7a834a8cf375d':
Fix ColorInversionTile for secondary users
Adrian Roos [Wed, 24 Sep 2014 16:46:20 +0000 (16:46 +0000)]
Merge "Fix ColorInversionTile for secondary users" into lmp-dev
Svetoslav [Wed, 24 Sep 2014 15:33:58 +0000 (15:33 +0000)]
am
15c86a84: Merge "Missing pages in print preview when scorolling." into lmp-dev
* commit '
15c86a84a5b595b43eecec611de22e6bd0c0eea4':
Missing pages in print preview when scorolling.
Svetoslav [Wed, 24 Sep 2014 15:33:51 +0000 (15:33 +0000)]
am
176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
* commit '
176b19559e3775e59ce852fa54343bea5663ee17':
Ignore not visible views computing click point for accessibility.
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 15:00:01 +0000 (15:00 +0000)]
am
f40f4af6: Merge "Add announcement of global actions dialog" into lmp-dev
* commit '
f40f4af681bc00572eb7838c094020ac0d0f17bf':
Add announcement of global actions dialog
Jason Monk [Wed, 24 Sep 2014 14:59:57 +0000 (14:59 +0000)]
am
c631f962: Merge "Fix accessibility announcement for QS details" into lmp-dev
* commit '
c631f9629ed936094352a7a2b8f23af3749f3bb6':
Fix accessibility announcement for QS details
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
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:52:22 +0000 (09:52 +0000)]
am
7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
* commit '
7602bc548c3c85e8958e899593cc1757d849d532':
Register ActivityManagerService.PackageMonitor for all users.
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 02:01:15 +0000 (02:01 +0000)]
am
a7fd1016: Merge "Use the right format to specify SUPL_MODE value." into lmp-dev
* commit '
a7fd1016b5210d1218d97e6a557c28b3bebedfb0':
Use the right format to specify SUPL_MODE value.
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
Craig Mautner [Wed, 24 Sep 2014 01:48:47 +0000 (01:48 +0000)]
am
d5b329e5: Merge "Force layout and animation when display changes" into lmp-dev
* commit '
d5b329e5aed07ffdd7cf0ba6e2aa100316d1bda8':
Force layout and animation when display changes
Eric Laurent [Wed, 24 Sep 2014 01:48:42 +0000 (01:48 +0000)]
am
ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
* commit '
ee99d0808dabcbad4716c4b90419219f14dbc9fc':
AudioRecord: add HW hotword capture flag
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:29:44 +0000 (01:29 +0000)]
am
895b6726: Merge "Only stop/start clatd if necessary." into lmp-dev
* commit '
895b6726e13611a614d245bbd4232f9f0449727f':
Only stop/start clatd if necessary.
Lorenzo Colitti [Wed, 24 Sep 2014 01:29:36 +0000 (01:29 +0000)]
am
6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit '
6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
Block address families with routes, not NetworkAgent side channel
Alan Viverette [Wed, 24 Sep 2014 01:29:30 +0000 (01:29 +0000)]
am
f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev
* commit '
f65bf6e62ff61d5c5e5c3dc5ca468d3feb2c8175':
Explicitly set Settings background to white
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:12:52 +0000 (01:12 +0000)]
am
0d18d08d: Merge "Work on issue #
17628623: Need to update default preferred activities for YouTube" into lmp-dev
* commit '
0d18d08d54cd2226e2391a8bf50e8e48add24ee0':
Work on issue #
17628623: Need to update default preferred activities for YouTube
Matthew Williams [Wed, 24 Sep 2014 01:12:47 +0000 (01:12 +0000)]
am
07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
* commit '
07b554fcce08611872ea053ea9c97fa2671fc6db':
Fix lock ordering in JobScheduler
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 [Wed, 24 Sep 2014 00:05:53 +0000 (00:05 +0000)]
am
e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
* commit '
e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
More ACTION_CHOOSER ClipData migration.
Svetoslav [Wed, 24 Sep 2014 00:00:13 +0000 (00:00 +0000)]
am
857f8013: Merge "Fix ANR in print spooler." into lmp-dev
* commit '
857f80134d6c23894f5589457883c57137b2ed27':
Fix ANR in print spooler.
Svetoslav [Wed, 24 Sep 2014 00:00:08 +0000 (00:00 +0000)]
am
ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev
* commit '
ea5d75d807b379592f3bfd6ccd4cb43d02f72f49':
Print spooler crash on back before first layout is complete.
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
Michael Wright [Tue, 23 Sep 2014 23:41:38 +0000 (23:41 +0000)]
am
d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev
* commit '
d8e4e4aef15ca2edaa8b18d221cbd80240359445':
Add keylayout for Asus Gamepad
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
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
Michael Wright [Tue, 23 Sep 2014 22:56:17 +0000 (15:56 -0700)]
Add keylayout for Asus Gamepad
Bug:
17627642
Change-Id: I9dd76bbc3ea0493d5a54479ef4dc94c520e35433
Igor Murashkin [Tue, 23 Sep 2014 22:59:56 +0000 (22:59 +0000)]
am
c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit '
c79b145f0216d2f9b099a409fee2c154de1f7019':
camera2-legacy: Workaround max jpeg/preview size AR mismatch
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:41:28 +0000 (22:41 +0000)]
am
0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '
0829f6b6e1c5dc79b8feb3cebfede2d89384ba85':
handle bssid blacklist in case of dhcp failures
vandwalle [Tue, 23 Sep 2014 22:31:33 +0000 (22:31 +0000)]
Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
Wink Saville [Tue, 23 Sep 2014 22:25:06 +0000 (22:25 +0000)]
Merge "Add SM isUsableSubIdValue" into lmp-sprout-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
Wink Saville [Tue, 23 Sep 2014 21:20:58 +0000 (14:20 -0700)]
Add SM isUsableSubIdValue
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
Jeff Brown [Tue, 23 Sep 2014 21:06:25 +0000 (21:06 +0000)]
am
42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev
* commit '
42ecd1447eb31fb6e1a08a7f47b73805b0250680':
Move setting the display state out of the critical section.
Jay Shrauner [Tue, 23 Sep 2014 21:06:21 +0000 (21:06 +0000)]
am
44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev
* commit '
44318d379813d9264aafa06a5376e115fe53f1ae':
Fix NPE crash when mPhone is null
Dianne Hackborn [Tue, 23 Sep 2014 21:06:17 +0000 (21:06 +0000)]
am
5a9cfe3e: Merge "Maybe fix issue #
17614177 APR: system process restarting due to infinite loop" into lmp-dev
* commit '
5a9cfe3ea7fdcec78094530032217fca477561b1':
Maybe fix issue #
17614177 APR: system process restarting due to infinite loop
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
Adam Powell [Tue, 23 Sep 2014 20:55:35 +0000 (20:55 +0000)]
am
c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit '
c8d72a97c53da122d41b8238f23609f99aca2e02':
Track persistent nested Y offset for fling velocity
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