OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 6afc2eec: am 56c5c2cc: am f65bf6e6: Merge "Explicitly set Settings background...
Alan Viverette [Wed, 24 Sep 2014 03:57:30 +0000 (03:57 +0000)]
am 6afc2eec: am 56c5c2cc: am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev

* commit '6afc2eec1070da1dc9f6ca48506337a057788bb8':
  Explicitly set Settings background to white

9 years agoam 657bd7ec: am fa3089f8: am 0d18d08d: Merge "Work on issue #17628623: Need to update...
Dianne Hackborn [Wed, 24 Sep 2014 03:57:26 +0000 (03:57 +0000)]
am 657bd7ec: am fa3089f8: am 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev

* commit '657bd7ec0f0dc96c4db0e1e44149659ded7e8052':
  Work on issue #17628623: Need to update default preferred activities for YouTube

9 years agoam 736a412c: am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler"...
Matthew Williams [Wed, 24 Sep 2014 03:57:22 +0000 (03:57 +0000)]
am 736a412c: am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev

* commit '736a412c994851acce7ad0b1c694b7e4bc6cf255':
  Fix lock ordering in JobScheduler

9 years agoam 7526e81c: am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration...
Jeff Sharkey [Wed, 24 Sep 2014 03:57:18 +0000 (03:57 +0000)]
am 7526e81c: am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev

* commit '7526e81ceb38281f077d7d6e6f619b409505d342':
  More ACTION_CHOOSER ClipData migration.

9 years agoam 205840f0: am 097cf25e: am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev
Svetoslav [Wed, 24 Sep 2014 03:57:14 +0000 (03:57 +0000)]
am 205840f0: am 097cf25e: am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev

* commit '205840f0d0612f4a1fcfaa18f77d8848cdd9d58d':
  Fix ANR in print spooler.

9 years agoam 74036092: am 6853ed42: am ea5d75d8: Merge "Print spooler crash on back before...
Svetoslav [Wed, 24 Sep 2014 03:57:10 +0000 (03:57 +0000)]
am 74036092: am 6853ed42: am ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev

* commit '74036092c2dc44199eaada9228cab8716acd01cf':
  Print spooler crash on back before first layout is complete.

9 years agoam c574be17: am 33a483a1: am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into...
Michael Wright [Wed, 24 Sep 2014 03:57:06 +0000 (03:57 +0000)]
am c574be17: am 33a483a1: am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev

* commit 'c574be1765e47d4bc8473e98826fd51658a12b7d':
  Add keylayout for Asus Gamepad

9 years agoam 56c5c2cc: am f65bf6e6: Merge "Explicitly set Settings background to white" into...
Alan Viverette [Wed, 24 Sep 2014 03:29:06 +0000 (03:29 +0000)]
am 56c5c2cc: am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev

* commit '56c5c2cc92e3fd56353773b6a26b1e27bd8c817d':
  Explicitly set Settings background to white

9 years agoam fa3089f8: am 0d18d08d: Merge "Work on issue #17628623: Need to update default...
Dianne Hackborn [Wed, 24 Sep 2014 03:28:05 +0000 (03:28 +0000)]
am fa3089f8: am 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev

* commit 'fa3089f8e7bd35890518021f4b51190e60c429fb':
  Work on issue #17628623: Need to update default preferred activities for YouTube

9 years agoam a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
Matthew Williams [Wed, 24 Sep 2014 03:28:01 +0000 (03:28 +0000)]
am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev

* commit 'a58a31acbbd2bb4a971cb82530495051dcf1d7d8':
  Fix lock ordering in JobScheduler

9 years agoam ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 03:23:43 +0000 (03:23 +0000)]
am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev

* commit 'ff48f1b32a838ebf3b9cb43acf6fc70b8382d4a9':
  More ACTION_CHOOSER ClipData migration.

9 years agoam 097cf25e: am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev
Svetoslav [Wed, 24 Sep 2014 03:23:40 +0000 (03:23 +0000)]
am 097cf25e: am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev

* commit '097cf25ecf444857dcc260b5db334f04455d2de1':
  Fix ANR in print spooler.

9 years agoam 6853ed42: am ea5d75d8: Merge "Print spooler crash on back before first layout...
Svetoslav [Wed, 24 Sep 2014 03:23:36 +0000 (03:23 +0000)]
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.

9 years agoam 33a483a1: am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev
Michael Wright [Wed, 24 Sep 2014 03:21:11 +0000 (03:21 +0000)]
am 33a483a1: am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev

* commit '33a483a1adc237ff2787d2a28645a7cbda37a8ab':
  Add keylayout for Asus Gamepad

9 years agoam f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev
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

9 years agoMerge "Explicitly set Settings background to white" 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

9 years agoExplicitly set Settings background to white
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

9 years agoam 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activit...
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

9 years agoam 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
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

9 years agoMerge "Work on issue #17628623: Need to update default preferred activities for YouTu...
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

9 years agoMerge "Fix lock ordering in JobScheduler" 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

9 years agoFix lock ordering in JobScheduler
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

9 years agoam e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
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.

9 years agoam 857f8013: Merge "Fix ANR in print spooler." into lmp-dev
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.

9 years agoam ea5d75d8: Merge "Print spooler crash on back before first layout is complete....
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.

9 years agoMerge "More ACTION_CHOOSER ClipData migration." into lmp-dev
Jeff Sharkey [Tue, 23 Sep 2014 23:58:50 +0000 (23:58 +0000)]
Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev

9 years agoMerge "Fix ANR in print spooler." into lmp-dev
Svetoslav [Tue, 23 Sep 2014 23:53:21 +0000 (23:53 +0000)]
Merge "Fix ANR in print spooler." into lmp-dev

9 years agoMerge "Print spooler crash on back before first layout is complete." 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

9 years agoWork on issue #17628623: Need to update default preferred activities for YouTube
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

9 years agoam d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev
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

9 years agoMore ACTION_CHOOSER ClipData migration.
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

9 years agoMerge "Add keylayout for Asus Gamepad" into lmp-dev
Michael Wright [Tue, 23 Sep 2014 23:35:19 +0000 (23:35 +0000)]
Merge "Add keylayout for Asus Gamepad" into lmp-dev

9 years agoFix ANR in print spooler.
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

9 years agoam bda40b57: am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg...
Igor Murashkin [Tue, 23 Sep 2014 23:23:22 +0000 (23:23 +0000)]
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

9 years agoam e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size...
Igor Murashkin [Tue, 23 Sep 2014 23:12:15 +0000 (23:12 +0000)]
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

9 years agoam 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp...
vandwalle [Tue, 23 Sep 2014 23:05:56 +0000 (23:05 +0000)]
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

9 years agoAdd keylayout for Asus Gamepad
Michael Wright [Tue, 23 Sep 2014 22:56:17 +0000 (15:56 -0700)]
Add keylayout for Asus Gamepad

Bug: 17627642
Change-Id: I9dd76bbc3ea0493d5a54479ef4dc94c520e35433

9 years agoam c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch...
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

9 years agoPrint spooler crash on back before first layout is complete.
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

9 years agoam 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures...
vandwalle [Tue, 23 Sep 2014 22:53:20 +0000 (22:53 +0000)]
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

9 years agoMerge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
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

9 years agoam 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev
Wink Saville [Tue, 23 Sep 2014 22:47:18 +0000 (22:47 +0000)]
am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev

* commit '07aa9ded607a826bb135acae310db9ae1b2829bb':
  Add SM isUsableSubIdValue

9 years agoam 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" 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

9 years agoam af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev
Wink Saville [Tue, 23 Sep 2014 22:36:02 +0000 (22:36 +0000)]
am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev

* commit 'af23987e8d704f6436984661536af293712e4467':
  Add SM isUsableSubIdValue

9 years agoMerge "handle bssid blacklist in case of dhcp failures" 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

9 years agoMerge "Add SM isUsableSubIdValue" into lmp-sprout-dev
Wink Saville [Tue, 23 Sep 2014 22:25:06 +0000 (22:25 +0000)]
Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev

9 years agocamera2-legacy: Workaround max jpeg/preview size AR mismatch
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

9 years agoAdd SM isUsableSubIdValue
Wink Saville [Tue, 23 Sep 2014 21:20:58 +0000 (14:20 -0700)]
Add SM isUsableSubIdValue

Change-Id: Ib1381116545688de52bde111acf827b2e07c5621

9 years agoam 1e7be6f4: am e43684a6: am 42ecd144: Merge "Move setting the display state out...
Jeff Brown [Tue, 23 Sep 2014 21:18:37 +0000 (21:18 +0000)]
am 1e7be6f4: am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev

* commit '1e7be6f4a3ed86f88351d3201b99a7fc9d1b35f4':
  Move setting the display state out of the critical section.

9 years agoam 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null"...
Jay Shrauner [Tue, 23 Sep 2014 21:18:33 +0000 (21:18 +0000)]
am 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev

* commit '9e0cb2a3ee60b0b837cb3cbbf84272616f47c879':
  Fix NPE crash when mPhone is null

9 years agoam 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system...
Dianne Hackborn [Tue, 23 Sep 2014 21:18:29 +0000 (21:18 +0000)]
am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev

* commit '0394c8bc98d76261881595efd7e6b3528e0637af':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop

9 years agoam 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for...
Adam Powell [Tue, 23 Sep 2014 21:18:25 +0000 (21:18 +0000)]
am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev

* commit '76cedc5b9670414289fc9824eb78a3962c61bbb1':
  Track persistent nested Y offset for fling velocity

9 years agoam e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical...
Jeff Brown [Tue, 23 Sep 2014 21:15:27 +0000 (21:15 +0000)]
am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev

* commit 'e43684a64c35e3a627037a671d351bda12e5eb0a':
  Move setting the display state out of the critical section.

9 years agoam 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev
Jay Shrauner [Tue, 23 Sep 2014 21:15:23 +0000 (21:15 +0000)]
am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev

* commit '6b70083ac1ec46451ab4b1902c4246a8063831d8':
  Fix NPE crash when mPhone is null

9 years agoam c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restar...
Dianne Hackborn [Tue, 23 Sep 2014 21:15:20 +0000 (21:15 +0000)]
am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev

* commit 'c39f4fc2c4110170deec0deaae104ae474022c59':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop

9 years agoam 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity...
Adam Powell [Tue, 23 Sep 2014 21:06:47 +0000 (21:06 +0000)]
am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev

* commit '0bff30ba60607232054d80090fb22916f1f7e551':
  Track persistent nested Y offset for fling velocity

9 years agoam 42ecd144: Merge "Move setting the display state out of the critical section."...
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.

9 years agoam 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev
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

9 years agoam 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due...
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

9 years agoMerge "Move setting the display state out of the critical section." into lmp-dev
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

9 years agoMerge "Fix NPE crash when mPhone is null" 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

9 years agoam c8d72a97: Merge "Track persistent nested Y offset for fling velocity" 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

9 years agoMerge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop...
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

9 years agoMerge "Track persistent nested Y offset for fling velocity" 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

9 years agoam e2a466c8: am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notificat...
John Spurlock [Tue, 23 Sep 2014 20:37:54 +0000 (20:37 +0000)]
am e2a466c8: am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev

* commit 'e2a466c868e341adb32f93f920d36af4c3b40332':
  Remove redundant wifi-display notification.

9 years agoam 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into...
John Spurlock [Tue, 23 Sep 2014 20:27:24 +0000 (20:27 +0000)]
am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev

* commit '1cabe53d61c17743800df7d58df5c5bd7ea6685f':
  Remove redundant wifi-display notification.

9 years agoam c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev
John Spurlock [Tue, 23 Sep 2014 20:15:11 +0000 (20:15 +0000)]
am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev

* commit 'c107ea7321829d7c4b7f22f9967ffd0250569b56':
  Remove redundant wifi-display notification.

9 years agoam 528e8bc6: am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinqu...
Dianne Hackborn [Tue, 23 Sep 2014 20:14:15 +0000 (20:14 +0000)]
am 528e8bc6: am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev

* commit '528e8bc65bf16a5a7f7bb3e90adb5fa9adc62708':
  Fix issue #17307700: retarget a relinquished task is not working

9 years agoam e2132370: am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot...
Jason Monk [Tue, 23 Sep 2014 20:14:11 +0000 (20:14 +0000)]
am e2132370: am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev

* commit 'e2132370fe34e027b8af9411f3f0323882e43b91':
  Add missing permission for hotspot QS tile

9 years agoMove setting the display state out of the critical section.
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

9 years agoMerge "Remove redundant wifi-display notification." into lmp-dev
John Spurlock [Tue, 23 Sep 2014 20:08:12 +0000 (20:08 +0000)]
Merge "Remove redundant wifi-display notification." into lmp-dev

9 years agoam 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task...
Dianne Hackborn [Tue, 23 Sep 2014 20:04:35 +0000 (20:04 +0000)]
am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev

* commit '559e3516e98c94343b551394b7f6871be5161b1d':
  Fix issue #17307700: retarget a relinquished task is not working

9 years agoam 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into...
Jason Monk [Tue, 23 Sep 2014 20:04:31 +0000 (20:04 +0000)]
am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev

* commit '6a05d8bfdab702ef4d1c12dd8d985856c886ff07':
  Add missing permission for hotspot QS tile

9 years agoam 63b6040c: am e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch...
Selim Cinek [Tue, 23 Sep 2014 19:57:55 +0000 (19:57 +0000)]
am 63b6040c: am e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev

* commit '63b6040cd7b164f516471a2e8ca490d69ca9e7a7':
  Enforcing falsing-threshold on touch when using AoD

9 years agoam 065502cb: am 892412af: am 8518c090: Merge "Fix animation on the some properties...
ztenghui [Tue, 23 Sep 2014 19:57:51 +0000 (19:57 +0000)]
am 065502cb: am 892412af: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev

* commit '065502cbc0bd229a2dbba1615fc867d42c5cb0e8':
  Fix animation on the some properties

9 years agoam 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working...
Dianne Hackborn [Tue, 23 Sep 2014 19:57:22 +0000 (19:57 +0000)]
am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev

* commit '14e957eeccf89844317273346a8c8baa00e3f2fc':
  Fix issue #17307700: retarget a relinquished task is not working

9 years agoam da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev
Jason Monk [Tue, 23 Sep 2014 19:51:27 +0000 (19:51 +0000)]
am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev

* commit 'da75ab99f1c77448cba0fb1bb45ac33a17b54532':
  Add missing permission for hotspot QS tile

9 years agoRemove redundant wifi-display notification.
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

9 years agoMerge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev
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

9 years agoam e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using...
Selim Cinek [Tue, 23 Sep 2014 19:45:35 +0000 (19:45 +0000)]
am e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev

* commit 'e9ae5c1601797d740818af89a50f02d7ad9ff31b':
  Enforcing falsing-threshold on touch when using AoD

9 years agoam 892412af: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev
ztenghui [Tue, 23 Sep 2014 19:45:32 +0000 (19:45 +0000)]
am 892412af: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev

* commit '892412afa23ec921de120aa9eb8a6a3177dbc392':
  Fix animation on the some properties

9 years agoMerge "Add missing permission for hotspot QS tile" into lmp-dev
Jason Monk [Tue, 23 Sep 2014 19:42:24 +0000 (19:42 +0000)]
Merge "Add missing permission for hotspot QS tile" into lmp-dev

9 years agohandle bssid blacklist in case of dhcp failures
vandwalle [Fri, 19 Sep 2014 22:21:35 +0000 (15:21 -0700)]
handle bssid blacklist in case of dhcp failures

Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6

9 years agoam 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
Selim Cinek [Tue, 23 Sep 2014 19:34:28 +0000 (19:34 +0000)]
am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev

* commit '69d53b0ee95c7b27223d12a67bbf653b3b8c9004':
  Enforcing falsing-threshold on touch when using AoD

9 years agoam 8518c090: Merge "Fix animation on the some properties" into lmp-dev
ztenghui [Tue, 23 Sep 2014 19:34:24 +0000 (19:34 +0000)]
am 8518c090: Merge "Fix animation on the some properties" into lmp-dev

* commit '8518c090e46554d7f7cce51778811abc525b2ae2':
  Fix animation on the some properties

9 years agoMerge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
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

9 years agoMerge "Fix animation on the some properties" 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

9 years agoam 7f205ca1: am 935559c6: am 28cec256: Merge "Better detection for SIM information...
Tsuwei Chen [Tue, 23 Sep 2014 19:22:18 +0000 (19:22 +0000)]
am 7f205ca1: am 935559c6: am 28cec256: 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

* commit '7f205ca1531b6687c828bc0cf2f125c4dc484b00':
  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.

9 years agoam 935559c6: am 28cec256: Merge "Better detection for SIM information readyness....
Tsuwei Chen [Tue, 23 Sep 2014 19:08:44 +0000 (19:08 +0000)]
am 935559c6: am 28cec256: 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

* commit '935559c69b6bdf30b236306b0ddeb835938a6efb':
  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.

9 years agoam 28cec256: Merge "Better detection for SIM information readyness. 1) listen to...
Tsuwei Chen [Tue, 23 Sep 2014 19:02:26 +0000 (19:02 +0000)]
am 28cec256: 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

* commit '28cec256a51c366dce3a69087617f44a6f46c218':
  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.

9 years agoam 394539a2: am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configur...
Etan Cohen [Tue, 23 Sep 2014 18:57:51 +0000 (18:57 +0000)]
am 394539a2: am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.

* commit '394539a286950ad4699fc14334e19782e4731d92':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.

9 years agoam dd7cabae: am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when...
Jorim Jaggi [Tue, 23 Sep 2014 18:57:48 +0000 (18:57 +0000)]
am dd7cabae: am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev

* commit 'dd7cabaec700643f551816c2b299baf8bca9a9aa':
  Only wait for relevant windows when turning on the screen

9 years agoMerge "Better detection for SIM information readyness. 1) listen to SUBINFO broadcast...
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

9 years agoam 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to...
Etan Cohen [Tue, 23 Sep 2014 18:46:06 +0000 (18:46 +0000)]
am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.

* commit '5f44592f930205ee037229b988580baef139a06d':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.

9 years agoam f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the...
Jorim Jaggi [Tue, 23 Sep 2014 18:46:00 +0000 (18:46 +0000)]
am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev

* commit 'f8704ea3351907b7f6eb066e53f00b45406d529b':
  Only wait for relevant windows when turning on the screen

9 years agoEnforcing falsing-threshold on touch when using AoD
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

9 years agoam 9bda7819: am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material...
Alan Viverette [Tue, 23 Sep 2014 18:39:04 +0000 (18:39 +0000)]
am 9bda7819: am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev

* commit '9bda78193580108126d29115bc9c1a60924ed5c4':
  Update refresh icon to tinted material vector asset

9 years agoam b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct...
Ruben Brunk [Tue, 23 Sep 2014 18:38:59 +0000 (18:38 +0000)]
am b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev

* commit 'b38a6f80d99c3bb66e66828847a3d67e5197c3bc':
  camera2: Update EACCES to throw correct exception in LEGACY.

9 years agoam dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that...
Etan Cohen [Tue, 23 Sep 2014 18:34:17 +0000 (18:34 +0000)]
am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.

* commit 'dd2b9f0754948f844517b3c82062c02d91762b28':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.

9 years agoam 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into...
Jorim Jaggi [Tue, 23 Sep 2014 18:34:11 +0000 (18:34 +0000)]
am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev

* commit '40a231d3d5f6cae79e83f54d3c3e50b596f0c315':
  Only wait for relevant windows when turning on the screen