Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,799 Commits 3 Branches 0 Tags
7fc93fa94474c19a511d0843295e1cd4c35d4b5a
Commit Graph

163799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Etan Cohen
7fc93fa944 am e6b9811f: am e08b7cc4: am 394539a2: am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown. 
* commit 'e6b9811fe2ec0be5a60df5fb24d7c06593efe1dc':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
 2014-09-23 20:56:48 +00:00
Jorim Jaggi
267e1618ce am d270fa31: am 270265db: am dd7cabae: am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 
* commit 'd270fa31e79ddc1b604f9ba039f6429ae43ab250':
  Only wait for relevant windows when turning on the screen
 2014-09-23 20:56:43 +00:00
Alan Viverette
76fcb9718d am c3a7df10: am bd4e3851: am 9bda7819: am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev 
* commit 'c3a7df103fe211a5a0a147acf9aeefc6e64c1793':
  Update refresh icon to tinted material vector asset
 2014-09-23 20:56:37 +00:00
Ruben Brunk
92273d4ae2 am 9763d624: am fba543e3: am b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 
* commit '9763d624dd0fba01ee2b2c3ff775fd57436c1d85':
  camera2: Update EACCES to throw correct exception in LEGACY.
 2014-09-23 20:56:32 +00:00
Jeff Tinker
8a8ac646c7 am 1762f744: am a55b9bcc: am 064b5a29: am cc1ba123: am 3eeac344: Merge "Implement API review feedback." into lmp-dev 
* commit '1762f7449695500670ebb86dd4ab0b3744e448d7':
  Implement API review feedback.
 2014-09-23 20:56:20 +00:00
Jeff Vander Stoep
2f712a51d7 am 407aa6d9: am b914e9bd: 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 '407aa6d90c7f3ba1c6a5a3c0eaa0ef5857655fd2':
  Sanity-check paths of files to be restored
 2014-09-23 20:56:15 +00:00
Jeff Vander Stoep
ba0d098f72 am 9ad223f7: am 8c3851ad: 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 '9ad223f729bb106cb5e05a301793f7b0969acf0b':
  Change permission guard on bindBackupAgent()
 2014-09-23 20:56:10 +00:00
mike dooley
0822ffb51d am 6493093a: am 79a88649: am f2004bab: am deb3f099: am 6e466a1b: Fixing ConcurrentModificationException. 
* commit '6493093a71296f21576edf77fcd377a680e073a3':
  Fixing ConcurrentModificationException.
 2014-09-23 20:56:05 +00:00
Tyler Gunn
68b2139040 am aa852403: am 16c82d0d: am 8793b950: am aaaa0cf6: am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev 
* commit 'aa8524034eca1a491e7ca44e7c523d51de8d15bc':
  @hide ConnectionService APIs.
 2014-09-23 20:55:54 +00:00
Christoph Studer
0c07268aa4 am d894e9b8: am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit 'd894e9b8d0aeccaf14c52152bffc87d43ce5bd83':
  SysUI: Correctly compare MediaControllers
 2014-09-23 20:55:48 +00:00
Etan Cohen
3ec0973db8 am e08b7cc4: am 394539a2: am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown. 
* commit 'e08b7cc4e730a3afdf1b9618b1bcb65664d16ec4':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
 2014-09-23 19:09:20 +00:00
Jorim Jaggi
722370275d am 270265db: am dd7cabae: am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 
* commit '270265db8543f9e665c3bd16da56f73f5391f612':
  Only wait for relevant windows when turning on the screen
 2014-09-23 19:09:16 +00:00
Jeff Brown
7f0a933196 am 82b1767d: am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '82b1767d33a698e8be960b4bd84bbb8d26575dfb':
  Fix window manager policy state when waking from doze.
 2014-09-23 19:08:17 +00:00
Jeff Brown
bd369f4a58 am f45e4d55: am c7b28e74: am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit 'f45e4d5535d1540c99b944e244e2720436d369f2':
  Ensure wakelock is released unconditionally.
 2014-09-23 19:08:13 +00:00
Etan Cohen
cc6809fc62 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.
 2014-09-23 18:57:51 +00:00
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
Alan Viverette
c508a1dbab am bd4e3851: am 9bda7819: am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev 
* commit 'bd4e3851c7f470ef590c89fb513bd1fa38dcc69b':
  Update refresh icon to tinted material vector asset
 2014-09-23 18:51:24 +00:00
Ruben Brunk
53f6963d73 am fba543e3: am b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 
* commit 'fba543e3d7afce12bc656d53e836fd61d520f05e':
  camera2: Update EACCES to throw correct exception in LEGACY.
 2014-09-23 18:51:19 +00:00
Etan Cohen
b9e142ce71 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.
 2014-09-23 18:46:06 +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
Etan Cohen
164a91ae0d 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.
 2014-09-23 18:34:17 +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
Etan Cohen
5e418a6692 Modify comment for "VoLTE replacement configuration" to clarify that used for unknown. 
Configuration RAT replacement value will be used in any ambiguous (LTE:14) or
unknown (UNKNOWN:0) scenario.

Bug: 16962905
Change-Id: Ica1cc809521df5836143d8a94849541f28342a89
 2014-09-23 18:28: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
Jeff Tinker
6f77dd8495 am a55b9bcc: am 064b5a29: am cc1ba123: am 3eeac344: Merge "Implement API review feedback." into lmp-dev 
* commit 'a55b9bccd0df738a5e3a4fb5676450e1e138a941':
  Implement API review feedback.
 2014-09-23 18:17:25 +00:00
Jeff Vander Stoep
ef66a66075 am b914e9bd: 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 'b914e9bd6d01b781334aabe7be3d6e510b3e8e8b':
  Sanity-check paths of files to be restored
 2014-09-23 18:17:20 +00:00
Jeff Vander Stoep
e018db451c am 8c3851ad: 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 '8c3851ad89f319b0e83fd6c2e29af09d8c747492':
  Change permission guard on bindBackupAgent()
 2014-09-23 18:17:16 +00:00
mike dooley
ab9241394a am 79a88649: am f2004bab: am deb3f099: am 6e466a1b: Fixing ConcurrentModificationException. 
* commit '79a88649463021cf9fedec63aeec31b0bc30c5f3':
  Fixing ConcurrentModificationException.
 2014-09-23 18:17:11 +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
Tyler Gunn
a67ded021e am 16c82d0d: am 8793b950: am aaaa0cf6: am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev 
* commit '16c82d0dfdf27cbe187fc111cf7dbb211f7cbe56':
  @hide ConnectionService APIs.
 2014-09-23 17:59:55 +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
Christoph Studer
ccc3f012b0 am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit 'b83d9dc3e1d853d43807375d79d90739e572b938':
  SysUI: Correctly compare MediaControllers
 2014-09-23 17:48:30 +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