Dianne Hackborn
193b27cd3d
Merge "Fix issue #17307700 : retarget a relinquished task is not working" into lmp-dev
2014-09-23 19:50:00 +00:00
Selim Cinek
ce50f5e4e8
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
2014-09-23 19:45:35 +00:00
ztenghui
55d085724f
am 892412af: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev
...
* commit '892412afa23ec921de120aa9eb8a6a3177dbc392':
Fix animation on the some properties
2014-09-23 19:45:32 +00:00
Jason Monk
56ac947b69
Merge "Add missing permission for hotspot QS tile" into lmp-dev
2014-09-23 19:42:25 +00:00
vandwalle
176a27f3ab
handle bssid blacklist in case of dhcp failures
...
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
2014-09-23 12:38:06 -07:00
Selim Cinek
fb88717ecb
am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
...
* commit '69d53b0ee95c7b27223d12a67bbf653b3b8c9004':
Enforcing falsing-threshold on touch when using AoD
2014-09-23 19:34:28 +00:00
ztenghui
2c72bde78a
am 8518c090: Merge "Fix animation on the some properties" into lmp-dev
...
* commit '8518c090e46554d7f7cce51778811abc525b2ae2':
Fix animation on the some properties
2014-09-23 19:34:24 +00:00
Tsuwei Chen
18d05f5d3d
am a8a84930: 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 'a8a84930456dc33f0fc7042b2a073baaf1fb38dd':
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.
2014-09-23 19:33:54 +00:00
Selim Cinek
59ca78c937
Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
2014-09-23 19:28:13 +00:00
ztenghui
a7bf56e7e0
Merge "Fix animation on the some properties" into lmp-dev
2014-09-23 19:26:41 +00:00
Tsuwei Chen
b20782e319
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.
2014-09-23 19:22:18 +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
Tsuwei Chen
9a031f93b9
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.
2014-09-23 19:08:44 +00:00
Tsuwei Chen
2ca1f6699d
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.
2014-09-23 19:02:26 +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
Tsuwei Chen
23e79fcef9
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
2014-09-23 18:54:03 +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
Selim Cinek
29ed3c92ef
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
2014-09-23 20:44:35 +02: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
Tsuwei Chen
678c13c02a
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.
Bug: 17288144
Change-Id: I65cb4e0879c55c078e85d062877e491904e78222
2014-09-23 11:23:13 -07:00
ztenghui
dbcccffc37
Fix animation on the some properties
...
The risk is low since most of them are just matching the naming to xml.
And this update won't cause build breakage.
b/17623982
Change-Id: I1eda0b8314ec7b94bc03976cdc365a7dc1039f4c
2014-09-23 11:22:26 -07: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
Dianne Hackborn
39569afc9f
Fix issue #17307700 : retarget a relinquished task is not working
...
Missed by 1!
Change-Id: If6504e37563d1242df8da4609cbcbcd550d68fdd
2014-09-23 10:56:58 -07: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