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

10002 Commits

Author SHA1 Message Date
Craig Mautner
923584df77 Merge "Fix math errors causing black screen." 2012-11-15 16:30:47 -08:00
Craig Mautner
a7233fe31a Fix math errors causing black screen. 
Turning off animations in the Developer options creates a ValueAnimator
duration scale of 0. This is used as the denominator in RampAnimator
which, if the numerator is also 0, sets mAnimatedValue to NaN. Rounding
NaN to the nearest int produces 0 which is then assigned to
mScreenBrightness in DisplayPowerState.

A copy mistake which assigned mTransitionAnimationScale as the default
value for mAnimatorDurationScale in WindowManagerService is also
fixed here.

Bug 7515609 fixed.

Change-Id: I39f8d0a7abdd5a1fe70d757fe95fbddaf7a0ed51
 2012-11-15 14:25:14 -08:00
Jesse Hall
9a2609f76e Merge "Handle hotplug events as described instead of rescanning" 2012-11-15 09:33:40 -08:00
Jesse Hall
e244db42da Handle hotplug events as described instead of rescanning 
Hotplug events say which display they're for and whether the display
was connected or disconnected. Before, this info was ignored, and the
event just triggered a rescan of all displays. If a display was
disconnected and then reconnected quickly, the rescan would treat this
as a no-op or a device property change and wouldn't turn the display
on.

Now the display manager attempts to update its state with the change
the event describes. So a quick disconnect/connect cycle will cause
the display to be turned on since the display manager will have
updated its internal state to reflect the disconnect event, and will
treat the connect event as a new display rather than a device property
change.

Bug: 7491120
Change-Id: If16268fbd0708683f6401ea72fbee9fb2c3c8d19
 2012-11-14 22:55:09 -08:00
Victoria Lease
798f1a8abd am c8b912aa: am 88337ac8: am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev 
* commit 'c8b912aa9fc37241757a0622fbb1b80f0554e987':
  Resolve LocationManager + ActivityManager conflict
 2012-11-14 13:25:21 -08:00
Victoria Lease
c8b912aa9f am 88337ac8: am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev 
* commit '88337ac8c0ada1f3baef25cf9d4d9d85b2a8459e':
  Resolve LocationManager + ActivityManager conflict
 2012-11-14 13:22:51 -08:00
Victoria Lease
88337ac8c0 am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev 
* commit '75819a9cddd646af72a6071311d8e5b3cd6b8c43':
  Resolve LocationManager + ActivityManager conflict
 2012-11-14 13:21:12 -08:00
Victoria Lease
75819a9cdd Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev 2012-11-14 13:18:58 -08:00
Victoria Lease
61ecb02f54 Resolve LocationManager + ActivityManager conflict 
LocationManagerService was serially stuffing the same Location into
multiple Intents, which it would immediately hand off to
ActivityManagerService, running as a different thread in the same
process. LocationManager would continue to work with that Location
while ActivityManagerService worked with a Parceled version of it.

However, Location.mExtras is also a Bundle, and both
ActivityManagerService and LocationManagerService ended up working
with references to the same Bundle. ActivityManagerService needs
it in Parceled form (ie mParceledData != null), but
LocationManagerService was triggering Bundle.unparcel() when
referencing the data contained within.

As a result, LocationManagerService was able to trigger NPE (or
worse) in ActivityManagerService by manipulating the mExtras
member of a Location that was in the process of being reported to
listeners.

To resolve this issue, I copy-construct a new Location to report to
each listener. This should prevent ActivityManagerService and
LocationManagerService from referencing the same Bundle data, as
Location's copy constructor also copyconstructs the mExtras member,
rather than simply share references.

Bug: 7518371
Change-Id: I1a92615cba361831494447d5de085a8d910b6b2c
 2012-11-13 15:12:51 -08:00
Craig Mautner
0f32fdc3db am 50acd731: am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit '50acd73173e5ca68db0a4cc01e75a2faef86b2fb':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:07:29 -08:00
Craig Mautner
50acd73173 am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit '67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:04:27 -08:00
Craig Mautner
67a3fb6f3b am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit 'c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:02:21 -08:00
Craig Mautner
c10914ca5c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 2012-11-13 10:00:04 -08:00
Jeff Sharkey
f2fb1ae93e am 3acb098c: am 25c94e9e: am 282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 
* commit '3acb098cf478dab086209d4230a6cf8513aacc1a':
  Avoid recycling recently removed user IDs.
 2012-11-12 10:36:50 -08:00
Jeff Sharkey
a19a027c76 am 298d5f42: am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 
* commit '298d5f422e6af0d12499173c403d4ff8dda3aeda':
  Increase readability of connectivity event log.
 2012-11-12 10:36:46 -08:00
Jeff Sharkey
3acb098cf4 am 25c94e9e: am 282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 
* commit '25c94e9ee302db6a0a94ffaf109b3eed7ac4ccb5':
  Avoid recycling recently removed user IDs.
 2012-11-12 10:34:45 -08:00
Jeff Sharkey
298d5f422e am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 
* commit 'b84f21c536e8779cb7920d422469fd6973497823':
  Increase readability of connectivity event log.
 2012-11-12 10:34:37 -08:00
Jeff Sharkey
25c94e9ee3 am 282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 
* commit '282e9fc62e571aba741ddc9523d6dfe2eca313b6':
  Avoid recycling recently removed user IDs.
 2012-11-12 10:32:11 -08:00
Jeff Sharkey
b84f21c536 am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 
* commit 'bc0edecb7372a9ddf7644cb694c131b76ace8c41':
  Increase readability of connectivity event log.
 2012-11-12 10:32:08 -08:00
Jeff Sharkey
282e9fc62e Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 2012-11-12 10:30:12 -08:00
Jeff Sharkey
bc0edecb73 Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 2012-11-12 10:28:34 -08:00
Satoshi Kataoka
d214296f7f Fix an issue on LED in IME switcher 
Bug: 5282186
Change-Id: I66362aefb319a02ca741e40a50b8b345a89c8726
 2012-11-12 18:43:06 +09:00
Ed Heyl
2184f99aab am ffea9170: am 5ec97f4e: am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit 'ffea917025254ab33670b1268588d63514ddf918':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 23:57:05 -08:00
Ed Heyl
ffea917025 am 5ec97f4e: am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '5ec97f4e82e1adc3bffb9c998b302464517e1f04':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 23:54:08 -08:00
Ed Heyl
5ec97f4e82 am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '4f017e757bdc87d603d135386c888118fc2653ba':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 22:53:24 -08:00
Jeff Sharkey
ec14d78cfa am 1aa4f6fe: am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit '1aa4f6fe7e150fb60c5f28a9c4dd8ad6fb06984a':
  Emit event log message when switching users.
 2012-11-09 22:49:38 -08:00
Ed Heyl
4f017e757b Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 2012-11-09 22:49:35 -08:00
Jeff Sharkey
1aa4f6fe7e am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit '5691474c9cbaeb37eeb659a3adbc05d31d668611':
  Emit event log message when switching users.
 2012-11-09 22:45:33 -08:00
Jeff Sharkey
5691474c9c am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit 'ad08e6dcfc54556759a876106419b4169e9caffe':
  Emit event log message when switching users.
 2012-11-09 22:42:06 -08:00
David Agnew
71789e11cc When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 00:01:04 -05:00
Jeff Sharkey
2528b50b91 Increase readability of connectivity event log. 
Bug: 6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
 2012-11-09 15:57:02 -08:00
Jeff Sharkey
86597df79f Emit event log message when switching users. 
Change-Id: I8e521e177b0e17e2ab9e033e0ff8bc421cd5f784
 2012-11-09 15:09:13 -08:00
Robert Greenwalt
321020b7e0 Merge "Remove DhcpInfoInternal" 2012-11-09 09:51:21 -08:00
Robert Greenwalt
4717c261b2 Remove DhcpInfoInternal 
First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
 2012-11-09 09:46:32 -08:00
Dianne Hackborn
55fdd58af8 am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
  Remove extraneous logs.
 2012-11-08 15:58:52 -08:00
Jim Miller
08bb2316f1 am 061b4fae: am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit '061b4fae3daf40c90b46e16b12e7f22142eb498c':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 15:58:03 -08:00
Amith Yamasani
d6a6c7f25f am 807dc6f0: am 081c36de: am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit '807dc6f038b906ca52741a5768020110be53a779':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 15:56:03 -08:00
Victoria Lease
d760606427 am 63fd43ba: am bf328b40: am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '63fd43ba50943940ae248c499f97e6d8c1903c5f':
  disable geofences for secondary users
 2012-11-08 15:54:56 -08:00
Dianne Hackborn
e0d454d2e8 am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
  Remove extraneous logs.
 2012-11-08 15:47:46 -08:00
Jim Miller
061b4fae3d am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 15:47:04 -08:00
Amith Yamasani
807dc6f038 am 081c36de: am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit '081c36ded6a562ae2bde4238592a1e7bc13ba151':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 15:44:40 -08:00
Victoria Lease
63fd43ba50 am bf328b40: am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'bf328b4043e2f37aba8a5e86ee10726fe65ffc8a':
  disable geofences for secondary users
 2012-11-08 15:42:56 -08:00
Jim Miller
d97b09b0f3 am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'bef827572ce9644253ea42ab91b11b8107d2300f':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-08 15:37:01 -08:00
Jim Miller
bef827572c am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-08 15:32:09 -08:00
Jean-Baptiste Queru
7c8d2b63c0 Merge from jb-mr1-dev-plus-aosp 
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
 2012-11-08 15:19:11 -08:00
Jean-Baptiste Queru
c23cfe57a9 Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD 2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
ce2a3746b8 merge 19f8aa180a7ccb29b11a322378002e37517abfc9 
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
 2012-11-08 14:13:21 -08:00
Dianne Hackborn
72325cdb65 am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit '63bc6c122d628ab24e332f58d3d7a59ea2627f85':
  Remove extraneous logs.
 2012-11-08 13:21:11 -08:00
Dianne Hackborn
a46a74fcd6 Merge "Remove extraneous logs." into jb-mr1-dev 2012-11-08 13:16:10 -08:00