159852 Commits

Author SHA1 Message Date
Matthew Williams
12096490d9 am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
* commit 'a58a31acbbd2bb4a971cb82530495051dcf1d7d8':
  Fix lock ordering in JobScheduler
2014-09-24 03:28:01 +00:00
Jeff Sharkey
fcdd7ab619 am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
* commit 'ff48f1b32a838ebf3b9cb43acf6fc70b8382d4a9':
  More ACTION_CHOOSER ClipData migration.
2014-09-24 03:23:43 +00:00
Svetoslav
fb00cd8e7d am 097cf25e: am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev
* commit '097cf25ecf444857dcc260b5db334f04455d2de1':
  Fix ANR in print spooler.
2014-09-24 03:23:40 +00:00
Svetoslav
647a708e0d am 6853ed42: am ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev
* commit '6853ed426dc3a0fa0efa0f168a6dd6e9df989e92':
  Print spooler crash on back before first layout is complete.
2014-09-24 03:23:36 +00:00
Michael Wright
7ee105bdf7 am 33a483a1: am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev
* commit '33a483a1adc237ff2787d2a28645a7cbda37a8ab':
  Add keylayout for Asus Gamepad
2014-09-24 03:21:11 +00:00
Tsuwei Chen
f86afcd2e2 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.
2014-09-24 02:01:15 +00:00
Tsuwei Chen
54fee68628 Merge "Use the right format to specify SUPL_MODE value." into lmp-dev 2014-09-24 01:53:31 +00:00
Craig Mautner
5585077bd5 am d5b329e5: Merge "Force layout and animation when display changes" into lmp-dev
* commit 'd5b329e5aed07ffdd7cf0ba6e2aa100316d1bda8':
  Force layout and animation when display changes
2014-09-24 01:48:47 +00:00
Eric Laurent
e6b8d8a03e am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
* commit 'ee99d0808dabcbad4716c4b90419219f14dbc9fc':
  AudioRecord: add HW hotword capture flag
2014-09-24 01:48:42 +00:00
Craig Mautner
83a76db6c5 Merge "Force layout and animation when display changes" into lmp-dev 2014-09-24 01:43:02 +00:00
Jungshik Jang
5352081c66 Enable all actions to have chance to consume incoming message.
Some actions such as "DevicePowerStatusAction", "PowerStatusMonitorAction",
"Routing Contron Action" might wait for receiving <Report Power Status>
message, but the oldest aciton, which is normally PowerStatusMonitorAction,
can consume it.
This change enables all actions to have chance to touch incoming message.

Along with this, it fixes audio mute bug during volume control.

Bug: 17597377
Change-Id: Iafb71f6ea6309a4fba79833da2d634222058ac78
2014-09-24 10:40:44 +09:00
Eric Laurent
c1823452ad Merge "AudioRecord: add HW hotword capture flag" into lmp-dev 2014-09-24 01:39:35 +00:00
Craig Mautner
9b5e824da7 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
2014-09-23 18:37:49 -07:00
Tsuwei Chen
cf03b60ce2 Use the right format to specify SUPL_MODE value.
Bug:17618140
Change-Id: I013219bb8febb4bb5c23d4896f432fd3a01c21f8
2014-09-23 18:31:48 -07:00
Lorenzo Colitti
1d7142f2a8 am 895b6726: Merge "Only stop/start clatd if necessary." into lmp-dev
* commit '895b6726e13611a614d245bbd4232f9f0449727f':
  Only stop/start clatd if necessary.
2014-09-24 01:29:44 +00:00
Lorenzo Colitti
34feaa0947 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
2014-09-24 01:29:36 +00:00
Alan Viverette
7306924cfa am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev
* commit 'f65bf6e62ff61d5c5e5c3dc5ca468d3feb2c8175':
  Explicitly set Settings background to white
2014-09-24 01:29:30 +00:00
Lorenzo Colitti
75b8966cad Merge "Only stop/start clatd if necessary." into lmp-dev 2014-09-24 01:21:17 +00:00
Lorenzo Colitti
e034716628 Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 2014-09-24 01:21:06 +00:00
Alan Viverette
ef686b3c44 Merge "Explicitly set Settings background to white" into lmp-dev 2014-09-24 01:17:53 +00:00
Alan Viverette
dfd9376072 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
2014-09-23 18:15:31 -07:00
Dianne Hackborn
193b14c468 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
2014-09-24 01:12:52 +00:00
Matthew Williams
319df9f7bb am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
* commit '07b554fcce08611872ea053ea9c97fa2671fc6db':
  Fix lock ordering in JobScheduler
2014-09-24 01:12:47 +00:00
Dianne Hackborn
58817f502c Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 2014-09-24 01:00:03 +00:00
Matthew Williams
8cfd9e6c11 Merge "Fix lock ordering in JobScheduler" into lmp-dev 2014-09-24 00:58:55 +00:00
Matthew Williams
48a30db75d 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
2014-09-23 17:34:46 -07:00
Jeff Sharkey
5c1ac3d443 am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
* commit 'e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
  More ACTION_CHOOSER ClipData migration.
2014-09-24 00:05:53 +00:00
Svetoslav
822a58aad3 am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev
* commit '857f80134d6c23894f5589457883c57137b2ed27':
  Fix ANR in print spooler.
2014-09-24 00:00:13 +00:00
Svetoslav
24ef6e43db 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.
2014-09-24 00:00:08 +00:00
Jeff Sharkey
fb488eb2a2 Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 2014-09-23 23:58:51 +00:00
Svetoslav
09eb0b2033 Merge "Fix ANR in print spooler." into lmp-dev 2014-09-23 23:53:21 +00:00
Svetoslav
2eefd97be6 Merge "Print spooler crash on back before first layout is complete." into lmp-dev 2014-09-23 23:52:59 +00:00
Dianne Hackborn
eeb2c7e712 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
2014-09-23 16:45:39 -07:00
Michael Wright
8c4f7a260b am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev
* commit 'd8e4e4aef15ca2edaa8b18d221cbd80240359445':
  Add keylayout for Asus Gamepad
2014-09-23 23:41:38 +00:00
Jeff Sharkey
c004eef7bb 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
2014-09-23 16:40:53 -07:00
Michael Wright
abe2df111f Merge "Add keylayout for Asus Gamepad" into lmp-dev 2014-09-23 23:35:20 +00:00
Igor Murashkin
00282c876e am 900d0072: am bda40b57: am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit '900d0072197ece4375f86e2e49d86b7e1c0821d2':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 23:29:59 +00:00
Svetoslav
5668348138 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
2014-09-23 16:25:54 -07:00
Igor Murashkin
bda7ff4b8b am bda40b57: am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit 'bda40b57247925cb9492690717575e1701fcf9f9':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 23:23:22 +00:00
vandwalle
6933d61f2d am 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '9e22f2803c26626851f24db7c54fa68b85ca5e45':
  handle bssid blacklist in case of dhcp failures
2014-09-23 23:18:18 +00:00
Igor Murashkin
2b268d7f8f am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit 'e3ad6ff81c8913ea55df88d8af019769a55f51e3':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 23:12:15 +00:00
vandwalle
384f83cd5c am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '713b200d26e50849fbdcdbaa5d6ceaf81f0cc196':
  handle bssid blacklist in case of dhcp failures
2014-09-23 23:05:56 +00:00
Michael Wright
5ba44281c7 Add keylayout for Asus Gamepad
Bug: 17627642
Change-Id: I9dd76bbc3ea0493d5a54479ef4dc94c520e35433
2014-09-23 16:04:35 -07:00
Igor Murashkin
a040e44417 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
2014-09-23 22:59:56 +00:00
Wink Saville
8ac6bb335d am 01632c82: am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev
* commit '01632c82fe635fd6501f9fd5190754e229944ce7':
  Add SM isUsableSubIdValue
2014-09-23 22:59:20 +00:00
Svetoslav
254361f136 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
2014-09-23 15:54:24 -07:00
vandwalle
e70f3bbfb7 am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '9794dc9569fd33ea706370ee153446645a7b1474':
  handle bssid blacklist in case of dhcp failures
2014-09-23 22:53:20 +00:00
Igor Murashkin
4f17981fdc Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 2014-09-23 22:50:30 +00:00
Wink Saville
a03f0a1e1f am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev
* commit '07aa9ded607a826bb135acae310db9ae1b2829bb':
  Add SM isUsableSubIdValue
2014-09-23 22:47:18 +00:00
vandwalle
5a94fd7c04 am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '0829f6b6e1c5dc79b8feb3cebfede2d89384ba85':
  handle bssid blacklist in case of dhcp failures
2014-09-23 22:41:28 +00:00