153571 Commits

Author SHA1 Message Date
Jorim Jaggi
85671d0458 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
2014-09-23 18:57:48 +00:00
Jorim Jaggi
5facc2f829 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
2014-09-23 18:46:00 +00:00
Alan Viverette
2608054780 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
2014-09-23 18:39:04 +00:00
Ruben Brunk
37af0beeb3 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.
2014-09-23 18:38:59 +00:00
Jorim Jaggi
ff4683d2af 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
2014-09-23 18:34:11 +00:00
Alan Viverette
31260dfd65 am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev
* commit 'a3494fedb2dcac5647f45abb80e612374234dc7b':
  Update refresh icon to tinted material vector asset
2014-09-23 18:27:45 +00:00
Ruben Brunk
8563395665 am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '56bd6a6b2ff9eb944f155294c669279bd99839cd':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:27:41 +00:00
Jorim Jaggi
2fb173a34b Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 2014-09-23 18:26:09 +00:00
Alan Viverette
4d2b60d136 am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev
* commit '043fc017b713c88122f8d7b6b9cba606e254805a':
  Update refresh icon to tinted material vector asset
2014-09-23 18:16:43 +00:00
Ruben Brunk
6a90fa0c20 am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '30306d89bd83fe884b11816f5cfc33d5ab3048cb':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:16:39 +00:00
Alan Viverette
a93e58f888 Merge "Update refresh icon to tinted material vector asset" into lmp-dev 2014-09-23 18:15:27 +00:00
Ruben Brunk
b0ddd2e0d6 Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 2014-09-23 18:08:42 +00:00
Jeff Tinker
09481f63af am 064b5a29: am cc1ba123: am 3eeac344: Merge "Implement API review feedback." into lmp-dev
* commit '064b5a295cb3964b65cea1ac905f9a268dece5b7':
  Implement API review feedback.
2014-09-23 18:05:11 +00:00
Jeff Vander Stoep
f775c39f6e am ae6bfa5f: am 432200da: am c0471f7a: am bca67fd7: am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit 'ae6bfa5f6e0ecbb6308d1afced27994d36fafb89':
  Sanity-check paths of files to be restored
2014-09-23 18:05:07 +00:00
Jeff Vander Stoep
a93531277b am 885b99d3: am 6283b728: am c22881d9: am bbf7e4af: am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '885b99d3d012e7055e15299337db2c98e66bbdff':
  Change permission guard on bindBackupAgent()
2014-09-23 18:05:03 +00:00
mike dooley
f260d7adcd am f2004bab: am deb3f099: am 6e466a1b: Fixing ConcurrentModificationException.
* commit 'f2004bab8e6106c4484c499346bf64742908db56':
  Fixing ConcurrentModificationException.
2014-09-23 18:04:58 +00:00
Jeff Tinker
fcaa697a2b am cc1ba123: am 3eeac344: Merge "Implement API review feedback." into lmp-dev
* commit 'cc1ba123327cf6bff23d856f5f1b9c16b8749986':
  Implement API review feedback.
2014-09-23 17:54:48 +00:00
Jeff Vander Stoep
48eb0a1b67 am 432200da: am c0471f7a: am bca67fd7: am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '432200da4de4ed785e54780340d3eeb4607d783a':
  Sanity-check paths of files to be restored
2014-09-23 17:54:45 +00:00
Jeff Vander Stoep
f781541fcc am 6283b728: am c22881d9: am bbf7e4af: am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '6283b728bb1632bf45fc3a3524d7cb873c46d3c1':
  Change permission guard on bindBackupAgent()
2014-09-23 17:54:41 +00:00
mike dooley
988ba7fa1f am deb3f099: am 6e466a1b: Fixing ConcurrentModificationException.
* commit 'deb3f099618c976813fd325efcb3e81e929111fe':
  Fixing ConcurrentModificationException.
2014-09-23 17:54:38 +00:00
Tyler Gunn
aff80e0fba am 8793b950: am aaaa0cf6: am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev
* commit '8793b950fb9f1821a65906037c006b1ad0f12440':
  @hide ConnectionService APIs.
2014-09-23 17:48:50 +00:00
Jeff Tinker
766dc23b88 am 3eeac344: Merge "Implement API review feedback." into lmp-dev
* commit '3eeac344b1aedf116b2340f3028f2cbaf34945d1':
  Implement API review feedback.
2014-09-23 17:43:07 +00:00
Jeff Vander Stoep
c436d5b71d am c0471f7a: am bca67fd7: am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit 'c0471f7a7452c687f0a10588484c0f69d6840541':
  Sanity-check paths of files to be restored
2014-09-23 17:43:04 +00:00
Jeff Vander Stoep
713fbceea0 am c22881d9: am bbf7e4af: am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit 'c22881d93a77e6a736b43e49942135ea6a40071e':
  Change permission guard on bindBackupAgent()
2014-09-23 17:43:00 +00:00
mike dooley
c975543ffc am 6e466a1b: Fixing ConcurrentModificationException.
* commit '6e466a1b87ce163a48fccea69e8b8f16ef36eee7':
  Fixing ConcurrentModificationException.
2014-09-23 17:42:56 +00:00
Jeff Tinker
f7efd5c6a8 Merge "Implement API review feedback." into lmp-dev 2014-09-23 17:39:31 +00:00
Jeff Vander Stoep
387cf898d0 am bca67fd7: am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit 'bca67fd7d0747a950e88525d216af41272b20763':
  Sanity-check paths of files to be restored
2014-09-23 17:37:58 +00:00
Jeff Vander Stoep
bda5a2deca am bbf7e4af: am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit 'bbf7e4af975493c9c213250a595c63331cb7a872':
  Change permission guard on bindBackupAgent()
2014-09-23 17:37:42 +00:00
Tyler Gunn
361798d6c1 am aaaa0cf6: am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev
* commit 'aaaa0cf6a1106aec82f99da5fcae6d584f9dfda6':
  @hide ConnectionService APIs.
2014-09-23 17:36:41 +00:00
Christoph Studer
10ec31a1f0 am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
* commit 'dfd80a4efbbc81f1dd6a5f7988da47332ea8a90c':
  SysUI: Correctly compare MediaControllers
2014-09-23 17:36:10 +00:00
mike dooley
95e8070e29 Fixing ConcurrentModificationException.
Implementing review feedback.

Bug: 17572658
Change-Id: I3a060d21669a58188a24c5d6ec5fefcbca45a976
2014-09-23 17:34:10 +00:00
Ruben Brunk
3084c2f519 camera2: Update EACCES to throw correct exception in LEGACY.
Bug: 17595068
Change-Id: I1a88568822237d3609c3342a21e2ca81ca935408
2014-09-23 10:32:18 -07:00
Jeff Vander Stoep
bca67fd7d0 am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '9aaf54eeb6c1dd83090235a8df5476b2f2f6473e':
  Sanity-check paths of files to be restored
2014-09-23 17:26:47 +00:00
Jeff Vander Stoep
bbf7e4af97 am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '1cf337a222bbb0e26445e7904ece687af93aac48':
  Change permission guard on bindBackupAgent()
2014-09-23 17:26:42 +00:00
Tyler Gunn
157bd0e39d am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev
* commit 'fa5456e5455d215fa73a504d78a8f152d8cd1b05':
  @hide ConnectionService APIs.
2014-09-23 17:25:07 +00:00
Christoph Studer
155a487b20 am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
* commit '1ff283b8ac6e52c4dd42be8572b32af415b68cdf':
  SysUI: Correctly compare MediaControllers
2014-09-23 17:25:00 +00:00
Tyler Gunn
79355e0304 Merge "@hide ConnectionService APIs." into lmp-dev 2014-09-23 17:13:12 +00:00
Jeff Vander Stoep
9aaf54eeb6 am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '71b19fc301ff08bd13d394dfa9ef6a3f535b149e':
  Sanity-check paths of files to be restored
2014-09-23 17:12:38 +00:00
Jeff Brown
2208a4f0dc am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit '2d8fd7982a3081eba582ccab49d7b5799cbb5afc':
  Fix window manager policy state when waking from doze.
2014-09-23 17:12:07 +00:00
Jeff Brown
ff957b0837 am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev
* commit 'e5121f0e6ab3303f22c7db8925db907d95bc82aa':
  Ensure wakelock is released unconditionally.
2014-09-23 17:12:03 +00:00
Jeff Vander Stoep
1cf337a222 am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '52824dab7ba48713411ff3a26580b29aa2088242':
  Change permission guard on bindBackupAgent()
2014-09-23 17:11:58 +00:00
Christoph Studer
8d843cea30 am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
* commit '5a7068eec454df33575176d9f4ee58de577a6401':
  SysUI: Correctly compare MediaControllers
2014-09-23 17:11:30 +00:00
Christoph Studer
231dc0a6d2 Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 2014-09-23 17:03:48 +00:00
Jeff Vander Stoep
71b19fc301 am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '5ba31e6e9afb34781fe5b927354502d9c6190bc5':
  Sanity-check paths of files to be restored
2014-09-23 17:02:13 +00:00
Jeff Vander Stoep
52824dab7b am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '1b4f1a794dc90c1ea877af64e8340afe6146584a':
  Change permission guard on bindBackupAgent()
2014-09-23 17:02:04 +00:00
Tyler Gunn
711d876fd1 @hide ConnectionService APIs.
Bug: 17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
2014-09-23 10:00:38 -07:00
Jeff Brown
45712f2e6d am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit 'c91bd121db79e5ea3c6ba6b333637f296992f11e':
  Fix window manager policy state when waking from doze.
2014-09-23 17:00:06 +00:00
Jeff Brown
e012dedfba am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev
* commit '86cb67b199e22136f461a4798bed32c98e6e145c':
  Ensure wakelock is released unconditionally.
2014-09-23 17:00:03 +00:00
Jorim Jaggi
dc9ead4409 Only wait for relevant windows when turning on the screen
Bug: 17536119
Change-Id: Ibe8da9fdd52a1a46eb856425b28ffc4f505b2697
2014-09-23 18:55:46 +02:00
Jeff Vander Stoep
5ba31e6e9a am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit 'bba797957a83b0ee8869cfa8a9427f6506f74fa4':
  Sanity-check paths of files to be restored
2014-09-23 16:50:29 +00:00