Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,577 Commits 3 Branches 0 Tags
24ef6e43db9f1cec923293df8461efcd323b13eb
Commit Graph

152577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Wright
abe2df111f Merge "Add keylayout for Asus Gamepad" into lmp-dev 2014-09-23 23:35:20 +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
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
Igor Murashkin
4f17981fdc Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 2014-09-23 22:50:30 +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
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
Wink Saville
8eab2b6bdf Add SM isUsableSubIdValue 
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
 2014-09-23 14:20:58 -07:00
Jeff Brown
490fc7b577 am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev 
* commit '42ecd1447eb31fb6e1a08a7f47b73805b0250680':
  Move setting the display state out of the critical section.
 2014-09-23 21:06:25 +00:00
Jay Shrauner
368ad52604 am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 
* commit '44318d379813d9264aafa06a5376e115fe53f1ae':
  Fix NPE crash when mPhone is null
 2014-09-23 21:06:21 +00:00
Dianne Hackborn
14f10be0bf am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit '5a9cfe3ea7fdcec78094530032217fca477561b1':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:06:17 +00:00
Jeff Brown
6800e1b921 Merge "Move setting the display state out of the critical section." into lmp-dev 2014-09-23 21:02:43 +00:00
Jay Shrauner
2fbab892e9 Merge "Fix NPE crash when mPhone is null" into lmp-dev 2014-09-23 20:59:15 +00:00
Adam Powell
6c0b8b794a am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit 'c8d72a97c53da122d41b8238f23609f99aca2e02':
  Track persistent nested Y offset for fling velocity
 2014-09-23 20:55:35 +00:00
Dianne Hackborn
d0e0154c1f Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 2014-09-23 20:55:05 +00:00
Adam Powell
01db31f899 Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 2014-09-23 20:46:47 +00:00
John Spurlock
5d3c840a87 am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev 
* commit 'c107ea7321829d7c4b7f22f9967ffd0250569b56':
  Remove redundant wifi-display notification.
 2014-09-23 20:15:11 +00:00
Jeff Brown
e75926d6dc Move setting the display state out of the critical section. 
Setting the display power state currently happens while holding the
display manager lock.  This change moves it out of the lock to
ensure other services don't get stuck for several hundred
milliseconds.

Unfortunately, surface flinger ends up stalled a little later
so this only solves part of the problem.

Bug: 17623774
Change-Id: I201137c5e7f82c776f28a436845fcf3191fd0ca5
 2014-09-23 13:12:00 -07:00
John Spurlock
def101127a Merge "Remove redundant wifi-display notification." into lmp-dev 2014-09-23 20:08:13 +00:00
Dianne Hackborn
e39c948fe3 am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev 
* commit '14e957eeccf89844317273346a8c8baa00e3f2fc':
  Fix issue #17307700: retarget a relinquished task is not working
 2014-09-23 19:57:22 +00:00
Jason Monk
f54df1d84b am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev 
* commit 'da75ab99f1c77448cba0fb1bb45ac33a17b54532':
  Add missing permission for hotspot QS tile
 2014-09-23 19:51:27 +00:00
John Spurlock
03365ccc39 Remove redundant wifi-display notification. 
Since all devices now appear in quick settings, remove the
framework notification and obsolete artifacts.

Bug:17607193
Change-Id: If952b826d79c77068285373c6b44a430f78c20b1
 2014-09-23 15:51:11 -04:00
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
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
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
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
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
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
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
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
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
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
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