Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,100 Commits 3 Branches 0 Tags
e70f3bbfb72fdb008bc3cd206caf8dcdc7934c4d
Commit Graph

153100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Wink Saville
8eab2b6bdf Add SM isUsableSubIdValue 
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
 2014-09-23 14:20:58 -07: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
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
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
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
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
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
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
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
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
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
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
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