drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,788 Commits 1 Branch 0 Tags
Commit Graph

159788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Williams
e04ea5674b am 23527c9e: am 736a412c: am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev 
* commit '23527c9e5416568c4e3cc0c316cc73fea30ee7df':
  Fix lock ordering in JobScheduler
 2014-09-24 04:13:37 +00:00
Jeff Sharkey
93b178d90e am bb44d63b: am 7526e81c: am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 
* commit 'bb44d63be156a24cad4e3ed81500efdc7fe4ca31':
  More ACTION_CHOOSER ClipData migration.
 2014-09-24 04:13:32 +00:00
Svetoslav
b977307573 am 35e8b096: am 205840f0: am 097cf25e: am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev 
* commit '35e8b096238da4f461f973f479c154b2dd23b307':
  Fix ANR in print spooler.
 2014-09-24 04:13:28 +00:00
Svetoslav
e3e2706758 am c99f265c: am 74036092: am 6853ed42: am ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev 
* commit 'c99f265c8fefbecedd2048c111fd34125efa8933':
  Print spooler crash on back before first layout is complete.
 2014-09-24 04:13:24 +00:00
Michael Wright
d8e5296d1e am a4f9179c: am c574be17: am 33a483a1: am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev 
* commit 'a4f9179ca61a26a44d1cca2048fbe35fadd60d36':
  Add keylayout for Asus Gamepad
 2014-09-24 04:13:20 +00:00
Matthew Williams
82c61a100c am 736a412c: am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev 
* commit '736a412c994851acce7ad0b1c694b7e4bc6cf255':
  Fix lock ordering in JobScheduler
 2014-09-24 03:57:22 +00:00
Jeff Sharkey
fada3f1346 am 7526e81c: am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 
* commit '7526e81ceb38281f077d7d6e6f619b409505d342':
  More ACTION_CHOOSER ClipData migration.
 2014-09-24 03:57:18 +00:00
Svetoslav
0787fa8b56 am 205840f0: am 097cf25e: am 857f8013: Merge "Fix ANR in print spooler." into lmp-dev 
* commit '205840f0d0612f4a1fcfaa18f77d8848cdd9d58d':
  Fix ANR in print spooler.
 2014-09-24 03:57:14 +00:00
Svetoslav
ac21efee32 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.
 2014-09-24 03:57:10 +00:00
Michael Wright
a64b336dc1 am c574be17: am 33a483a1: am d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev 
* commit 'c574be1765e47d4bc8473e98826fd51658a12b7d':
  Add keylayout for Asus Gamepad
 2014-09-24 03:57:06 +00:00
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
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
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
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
Wink Saville
b43795579b am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 
* commit 'af23987e8d704f6436984661536af293712e4467':
  Add SM isUsableSubIdValue
 2014-09-23 22:36:02 +00:00
vandwalle
ba46bac83a Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 2014-09-23 22:31:34 +00:00
Wink Saville
3bb63f423e Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 2014-09-23 22:25:07 +00:00
Igor Murashkin
a0496d34ff 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
 2014-09-23 15:11:36 -07:00
Jeff Brown
7bbf92c1ab am 984bed19: am 1e7be6f4: am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev 
* commit '984bed19af7c43ffcefb07e85a11abd9cbd61eec':
  Move setting the display state out of the critical section.
 2014-09-23 21:31:09 +00:00
Jay Shrauner
4c8b15018d am 8b568d69: am 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 
* commit '8b568d69023a4d5e27ace06c838e333964bd5cba':
  Fix NPE crash when mPhone is null
 2014-09-23 21:31:04 +00:00
Dianne Hackborn
d96238d02e am a85c287d: am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit 'a85c287d53335cdc2fbdde711216a6f5db5a1a24':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:31:00 +00:00
Adam Powell
bbceeffebe am 7c673645: am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit '7c673645310530dc22ee99719f3538dabbd69a02':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:30:55 +00:00
Wink Saville
8eab2b6bdf Add SM isUsableSubIdValue 
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
 2014-09-23 14:20:58 -07:00