drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,752 Commits 1 Branch 0 Tags
Commit Graph

159752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vandwalle
6933d61f2d am 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '9e22f2803c26626851f24db7c54fa68b85ca5e45':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 23:18:18 +00:00
vandwalle
384f83cd5c am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '713b200d26e50849fbdcdbaa5d6ceaf81f0cc196':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 23:05:56 +00:00
Wink Saville
8ac6bb335d am 01632c82: am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 
* commit '01632c82fe635fd6501f9fd5190754e229944ce7':
  Add SM isUsableSubIdValue
 2014-09-23 22:59:20 +00:00
vandwalle
e70f3bbfb7 am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '9794dc9569fd33ea706370ee153446645a7b1474':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 22:53:20 +00:00
Wink Saville
a03f0a1e1f am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 
* commit '07aa9ded607a826bb135acae310db9ae1b2829bb':
  Add SM isUsableSubIdValue
 2014-09-23 22:47:18 +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
Wink Saville
b43795579b am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 
* commit 'af23987e8d704f6436984661536af293712e4467':
  Add SM isUsableSubIdValue
 2014-09-23 22:36:02 +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
Jeff Brown
7bbf92c1ab am 984bed19: am 1e7be6f4: am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev 
* commit '984bed19af7c43ffcefb07e85a11abd9cbd61eec':
  Move setting the display state out of the critical section.
 2014-09-23 21:31:09 +00:00
Jay Shrauner
4c8b15018d am 8b568d69: am 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 
* commit '8b568d69023a4d5e27ace06c838e333964bd5cba':
  Fix NPE crash when mPhone is null
 2014-09-23 21:31:04 +00:00
Dianne Hackborn
d96238d02e am a85c287d: am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit 'a85c287d53335cdc2fbdde711216a6f5db5a1a24':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:31:00 +00:00
Adam Powell
bbceeffebe am 7c673645: am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit '7c673645310530dc22ee99719f3538dabbd69a02':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:30:55 +00:00
Wink Saville
8eab2b6bdf Add SM isUsableSubIdValue 
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
 2014-09-23 14:20:58 -07:00
Jeff Brown
25800dfa6d am 1e7be6f4: am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev 
* commit '1e7be6f4a3ed86f88351d3201b99a7fc9d1b35f4':
  Move setting the display state out of the critical section.
 2014-09-23 21:18:37 +00:00
Jay Shrauner
114b192ae5 am 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 
* commit '9e0cb2a3ee60b0b837cb3cbbf84272616f47c879':
  Fix NPE crash when mPhone is null
 2014-09-23 21:18:33 +00:00
Dianne Hackborn
f45a7b44e7 am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit '0394c8bc98d76261881595efd7e6b3528e0637af':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:18:29 +00:00
Adam Powell
ef87adb689 am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit '76cedc5b9670414289fc9824eb78a3962c61bbb1':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:18:25 +00:00
Jeff Brown
0dc92f3a43 am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev 
* commit 'e43684a64c35e3a627037a671d351bda12e5eb0a':
  Move setting the display state out of the critical section.
 2014-09-23 21:15:27 +00:00
Jay Shrauner
5b0ec499fb am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 
* commit '6b70083ac1ec46451ab4b1902c4246a8063831d8':
  Fix NPE crash when mPhone is null
 2014-09-23 21:15:23 +00:00
Dianne Hackborn
588016f72e am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit 'c39f4fc2c4110170deec0deaae104ae474022c59':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:15:20 +00:00
Adam Powell
3b00941049 am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit '0bff30ba60607232054d80090fb22916f1f7e551':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:06:47 +00: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
John Spurlock
c44c0a52eb am 2c3ead39: am e2a466c8: am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev 
* commit '2c3ead392997928ea30da5014243a09c6591c5b8':
  Remove redundant wifi-display notification.
 2014-09-23 20:49:22 +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
9ca7eb8c48 am e2a466c8: am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev 
* commit 'e2a466c868e341adb32f93f920d36af4c3b40332':
  Remove redundant wifi-display notification.
 2014-09-23 20:37:54 +00:00
John Spurlock
7ecc4852d6 am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev 
* commit '1cabe53d61c17743800df7d58df5c5bd7ea6685f':
  Remove redundant wifi-display notification.
 2014-09-23 20:27:24 +00:00
Dianne Hackborn
b9fe2bfcd9 am cddaf1fd: am 528e8bc6: am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev 
* commit 'cddaf1fdcc5cc08ff91fd3d4f4bbfa5b7ac7b4a6':
  Fix issue #17307700: retarget a relinquished task is not working
 2014-09-23 20:26:21 +00:00
Jason Monk
2186efeb91 am 65149ac3: am e2132370: am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev 
* commit '65149ac32a3f11b7ffcbad625664ed17b7f8a4d8':
  Add missing permission for hotspot QS tile
 2014-09-23 20:26:17 +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
Dianne Hackborn
0544587772 am 528e8bc6: am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev 
* commit '528e8bc65bf16a5a7f7bb3e90adb5fa9adc62708':
  Fix issue #17307700: retarget a relinquished task is not working
 2014-09-23 20:14:15 +00:00
Jason Monk
b3d1424b35 am e2132370: am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev 
* commit 'e2132370fe34e027b8af9411f3f0323882e43b91':
  Add missing permission for hotspot QS tile
 2014-09-23 20:14: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
Selim Cinek
d5cc15014d am 1817e501: am 63b6040c: am e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev 
* commit '1817e501f12440d8447f3168c9dfe6a6a280360c':
  Enforcing falsing-threshold on touch when using AoD
 2014-09-23 20:08:58 +00:00
ztenghui
485736aeae am 2b7813c6: am 065502cb: am 892412af: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev 
* commit '2b7813c628abb1f5044d2e680c88b4edfdf71660':
  Fix animation on the some properties
 2014-09-23 20:08:54 +00:00
John Spurlock
def101127a Merge "Remove redundant wifi-display notification." into lmp-dev 2014-09-23 20:08:13 +00:00
Dianne Hackborn
c36662b042 am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev 
* commit '559e3516e98c94343b551394b7f6871be5161b1d':
  Fix issue #17307700: retarget a relinquished task is not working
 2014-09-23 20:04:35 +00:00
Jason Monk
b67ecd016e am 6a05d8bf: am da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev 
* commit '6a05d8bfdab702ef4d1c12dd8d985856c886ff07':
  Add missing permission for hotspot QS tile
 2014-09-23 20:04:31 +00:00
Selim Cinek
fe9d23df83 am 63b6040c: am e9ae5c16: am 69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev 
* commit '63b6040cd7b164f516471a2e8ca490d69ca9e7a7':
  Enforcing falsing-threshold on touch when using AoD
 2014-09-23 19:57:55 +00:00
ztenghui
b562b37539 am 065502cb: am 892412af: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev 
* commit '065502cbc0bd229a2dbba1615fc867d42c5cb0e8':
  Fix animation on the some properties
 2014-09-23 19:57:51 +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