114004 Commits

Author SHA1 Message Date
Craig Mautner
042634cc48 am e932a69f: am dc333542: Merge "Add debug logging for b/10689184." into klp-dev
* commit 'e932a69f162e3205c8a28e9521bf9ccb9e495ce0':
  Add debug logging for b/10689184.
2013-09-15 14:52:29 -07:00
Craig Mautner
e932a69f16 am dc333542: Merge "Add debug logging for b/10689184." into klp-dev
* commit 'dc3335429acf184cf67d022de6fe286c3672663a':
  Add debug logging for b/10689184.
2013-09-15 14:50:39 -07:00
Craig Mautner
dc3335429a Merge "Add debug logging for b/10689184." into klp-dev 2013-09-15 21:47:52 +00:00
Craig Mautner
5845812780 Add debug logging for b/10689184.
Focus is now on focus. Remove logging when fixed.

Change-Id: Ic0cd2d6bd4e65dac9dd40f4745dd12fb84f687ce
2013-09-15 14:18:54 -07:00
John Spurlock
37d608d7c8 Fix layout glitch specific to quick-settings -> settings.
When collapsing panels in code, relinquish focus immediately,
  triggering an immediate reeval of current focus in WM,
    triggering an immediate reeval of sysui flags,
      triggering an immediate system bar transition
      with the correct destination content frame.

Otherwise we eventually get around to it, after several layers
of sysui animation delays, but delaying the sysui visibility
re-eval until this point is far too late.

Bug:10696375
Change-Id: I947289667225b6a12bb8c81950df0e2e2d9f1f99
2013-09-15 15:46:28 -04:00
Zhijun He
68ebc1a7b4 Camera2: Add MAX_CAMERAS_IN_USE error case handling
Throw CAE with reason MAX_CAMERAS_IN when the error code is EDQUOT.

Bug: 10749544
Change-Id: I6820de8b95662a55bb37f099746ea2cbe5056f24
2013-09-15 11:55:44 -07:00
Svetoslav Ganov
a6df7120f4 am b30e185b: am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
* commit 'b30e185b440e04eac5119653a2868395554febfe':
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
2013-09-15 11:50:44 -07:00
Svetoslav Ganov
b30e185b44 am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
* commit '4244d66a122258adc86a8d757d3fe5f9588a59f8':
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
2013-09-15 11:48:10 -07:00
Svetoslav Ganov
4244d66a12 Merge changes Id0a67846,I20b57d66 into klp-dev
* changes:
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
2013-09-15 18:46:02 +00:00
Svetoslav Ganov
de4fa2dfe2 Print system may get stuck bound to a print service
1. If a print service dies, is restarted and at the time of the
   restart the service has neither print jobs nor a discovery
   serssion it gets stuck into a bound state. Now it unbinds if
   after binding and ensuring it is in the lifecycle state right
   before the death there are no active print jobs and no discovery
   session.

   Also when a print service dies we fail all of its print jobs
   but did not update the service that all of its print jobs are
   handled, i.e. it has no active print jobs.

2. Fixed a null pointer exception in UserState

bug:10696723

Change-Id: Id0a67846093fca5d4c1e10843eaf6aa90169d942
2013-09-15 02:58:14 -07:00
Baligh Uddin
fc49e61f18 am 1c1b87e2: (-s ours) am 3386b07e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1c1b87e2cf95428241b0a1e4b96a8d0854e98b1e':
  Import translations. DO NOT MERGE
2013-09-14 21:44:48 -07:00
Baligh Uddin
852ac08874 am 2e4de5f7: (-s ours) am 215da064: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2e4de5f7b7925149fa4b84a1709a45d00e0d94d7':
  Import translations. DO NOT MERGE
2013-09-14 21:40:44 -07:00
Baligh Uddin
aefb9c972b am 9f7b6d20: (-s ours) am 694980e0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '9f7b6d20e577c192af4871a375324bd4b6fccbca':
  Import translations. DO NOT MERGE
2013-09-14 21:40:41 -07:00
Baligh Uddin
07af779409 am f315b6d5: (-s ours) am def10485: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f315b6d5d5e704fda8375c658565ac901185a154':
  Import translations. DO NOT MERGE
2013-09-14 21:40:38 -07:00
Baligh Uddin
0f2e2826d9 am e232759b: (-s ours) am 169a37ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'e232759b3ca043262902d2bb12f7be5288fbd5d4':
  Import translations. DO NOT MERGE
2013-09-14 21:40:35 -07:00
Baligh Uddin
1c1b87e2cf am 3386b07e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '3386b07ef1efbe091ab14719e9f8b61fa419d839':
  Import translations. DO NOT MERGE
2013-09-14 21:39:35 -07:00
Baligh Uddin
3386b07ef1 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 04:36:52 +00:00
Baligh Uddin
2e4de5f7b7 am 215da064: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '215da064f74d3afe8f3991305ca019317e81f4f4':
  Import translations. DO NOT MERGE
2013-09-14 21:35:27 -07:00
Baligh Uddin
9f7b6d20e5 am 694980e0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '694980e075f05e7c0038c2c0c06153a13fb84149':
  Import translations. DO NOT MERGE
2013-09-14 21:35:23 -07:00
Baligh Uddin
f315b6d5d5 am def10485: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'def10485e32ee32d36a07fe7183de59369dabd28':
  Import translations. DO NOT MERGE
2013-09-14 21:35:21 -07:00
Baligh Uddin
e232759b3c am 169a37ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '169a37ce8f9ba795c7904ee1948f89bf17ee481a':
  Import translations. DO NOT MERGE
2013-09-14 21:35:18 -07:00
Baligh Uddin
215da064f7 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 04:31:30 +00:00
Baligh Uddin
694980e075 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 04:31:25 +00:00
Baligh Uddin
def10485e3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 04:31:09 +00:00
Baligh Uddin
169a37ce8f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 04:31:02 +00:00
Baligh Uddin
1c8b3fa018 Import translations. DO NOT MERGE
Change-Id: I12383ccb553cbace814156dafc8aad62a007f2c0
Auto-generated-cl: translation import
2013-09-14 21:08:26 -07:00
Baligh Uddin
763a9f96e8 Import translations. DO NOT MERGE
Change-Id: Iedddc6498eb09ce99ae5ffbc60c2069d4373b3e5
Auto-generated-cl: translation import
2013-09-14 20:33:13 -07:00
Baligh Uddin
428580bb78 Import translations. DO NOT MERGE
Change-Id: Iab13f37067f3888f58ada1c4764674194eb24c25
Auto-generated-cl: translation import
2013-09-14 20:32:29 -07:00
Baligh Uddin
a32469694c am db0f02cb: (-s ours) am 75d888b1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'db0f02cba92f7296e90d1ed9ed07d266c99ca96a':
  Import translations. DO NOT MERGE
2013-09-14 20:32:16 -07:00
Baligh Uddin
e54b83b0ee am 60772a57: (-s ours) am d1a12c16: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '60772a576578436e012e9bda521b872b5a8c7eb5':
  Import translations. DO NOT MERGE
2013-09-14 20:32:13 -07:00
Baligh Uddin
da9120b062 Import translations. DO NOT MERGE
Change-Id: Ie76c722a4e7525264922041684f25b5b35286973
Auto-generated-cl: translation import
2013-09-14 20:30:38 -07:00
Baligh Uddin
610ecfe8e8 Import translations. DO NOT MERGE
Change-Id: I45ac6ed92f61d59d2e2fdf87a1ac02db3510720c
Auto-generated-cl: translation import
2013-09-14 20:29:57 -07:00
Baligh Uddin
db0f02cba9 am 75d888b1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '75d888b188d7a43c73b285a0b0e46e9dad719ddc':
  Import translations. DO NOT MERGE
2013-09-14 20:29:24 -07:00
Baligh Uddin
60772a5765 am d1a12c16: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd1a12c169a40ead37f340e7e8cb9c20ffede8f38':
  Import translations. DO NOT MERGE
2013-09-14 20:29:21 -07:00
Baligh Uddin
75d888b188 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 03:27:49 +00:00
Baligh Uddin
31ceae5629 Import translations. DO NOT MERGE
Change-Id: I68895c16a26ecc9554bfc53e9d9346fe29412fec
Auto-generated-cl: translation import
2013-09-14 20:27:22 -07:00
Baligh Uddin
d1a12c169a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 03:26:53 +00:00
Baligh Uddin
e4509e43f9 Import translations. DO NOT MERGE
Change-Id: I190e27f9b7d9774cf922b50e1f0ac9c5d08a5652
Auto-generated-cl: translation import
2013-09-14 20:26:04 -07:00
Baligh Uddin
2a0568b27b am 49c89094: (-s ours) am 330dcb88: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '49c89094c4623c5d741635a0b669655a2c3c2865':
  Import translations. DO NOT MERGE
2013-09-14 20:15:15 -07:00
Baligh Uddin
49c89094c4 am 330dcb88: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '330dcb882cced28969dffa982b3909c5d1a19a59':
  Import translations. DO NOT MERGE
2013-09-14 20:12:32 -07:00
Baligh Uddin
df885c1b53 am 4f8b040d: (-s ours) am f222e288: (-s ours) Import translations. DO NOT MERGE
* commit '4f8b040d85d14eaef18967ae11493af1b3bdf41d':
  Import translations. DO NOT MERGE
2013-09-14 20:11:37 -07:00
Baligh Uddin
330dcb882c Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-15 03:09:03 +00:00
Baligh Uddin
4f8b040d85 am f222e288: (-s ours) Import translations. DO NOT MERGE
* commit 'f222e28849cfabe4c601a785e4618bf92bbfe62e':
  Import translations. DO NOT MERGE
2013-09-14 20:08:54 -07:00
Baligh Uddin
5242b4b997 Import translations. DO NOT MERGE
Change-Id: Iebcc32693fe755e3f7e73b255e61f1963e4c15e9
Auto-generated-cl: translation import
2013-09-14 20:06:00 -07:00
Baligh Uddin
f222e28849 Import translations. DO NOT MERGE
Change-Id: I1e4035acc161f784dc2f35eaf1f346ecbddf2fcf
Auto-generated-cl: translation import
2013-09-14 20:04:06 -07:00
John Spurlock
84962061c1 am d17b576d: am fa055694: Merge "Promote lights-out to a bar transition mode." into klp-dev
* commit 'd17b576d5ef220d5ae6ce6373a12a02fc512e249':
  Promote lights-out to a bar transition mode.
2013-09-14 14:33:37 -07:00
John Spurlock
576f1a61c6 am 4b3943cf: am 0819e342: Merge "Despotted back." into klp-dev
* commit '4b3943cf25bc5b149d8a27c8cc6e3a12efeba498':
  Despotted back.
2013-09-14 14:33:34 -07:00
John Spurlock
d17b576d5e am fa055694: Merge "Promote lights-out to a bar transition mode." into klp-dev
* commit 'fa0556943ee386e83d190f1de86d73d81e08cc8a':
  Promote lights-out to a bar transition mode.
2013-09-14 14:32:04 -07:00
John Spurlock
4b3943cf25 am 0819e342: Merge "Despotted back." into klp-dev
* commit '0819e3422106ef2368fa7539a325bae63bdffb26':
  Despotted back.
2013-09-14 14:32:01 -07:00
John Spurlock
fa0556943e Merge "Promote lights-out to a bar transition mode." into klp-dev 2013-09-14 21:31:09 +00:00