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

12234 Commits

Author SHA1 Message Date
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
David Agnew
4c0fc03b5e When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Bug: 7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 14:35:02 -05: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
9d6d890e0d Reduce verbosity of service event logging. 
Omits service name from destroyed events, since it can be derived by
looking back to the created event with the same ServiceRecord.

Change-Id: Ib7ab1031c0859437735e1fc985d58f47629b7ac4
 2012-11-09 17:32:43 -08: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
Dianne Hackborn
7ff30113de Remove extraneous logs. 
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
 2012-11-08 13:13:48 -08:00
Jim Miller
a2bf6181df am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 13:13:23 -08:00
Amith Yamasani
081c36ded6 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 'bfb8a7b19234998e28afe811a193a6514a349ea5':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 09:30:22 -08:00
Victoria Lease
eeaf165a5f am 44d927ca: am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '44d927ca837f03e99a4dda52377275da2863ecbb':
  Fires geofence if the device is already in the geofence area.
 2012-11-08 06:18:31 -08:00
Victoria Lease
44d927ca83 am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '66f3d7f3c8247b59516cbc4ad13bea4e0b8c0ef9':
  Fires geofence if the device is already in the geofence area.
 2012-11-08 06:13:21 -08:00
Jim Miller
4eeb4f664a Add mechanism to kick keyguard to show the assistant 
Fixes bug 7499778

Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
 2012-11-08 00:39:04 -08:00
Amith Yamasani
3fe2cb4db6 Merge "Don't cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 2012-11-07 21:12:54 -08:00
Jeff Brown
74da109102 Support Wifi display devices that rename themselves. 
Some Wifi display devices like to rename themselves after a
connection completes (or at other times).  Make sure to update
the name of the display when we detect that it changed in
our scan results.

This problem is somewhat complicated by the fact that we remember
the display name persistently, so we need to update our list
of remembered displays too.

Improve the state machine to avoid redundant attempts to
disconnect or cancel connection.

Bug: 7478895
Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
 2012-11-07 18:43:32 -08:00
Amith Yamasani
5ec00e930f Don't cancel any notifications that are meant for all users, if no package is specified. 
Bug: 7490028

Otherwise notifications such as the USB debugging and OTA notifications will be
dismissed when any user is stopped.

Change-Id: I0ae0c1136a999dd3aade99ca9e71c714b359eab4
 2012-11-07 16:58:30 -08:00
Mike Lockwood
13d9d4ffaf Merge "SerialManager: Only allow opening files that are whitelisted serial port devices" 2012-11-07 14:04:55 -08:00
Victoria Lease
bf328b4043 am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '4abe2d3d367029080653818f538222603f13bed2':
  disable geofences for secondary users
 2012-11-07 14:03:55 -08:00
Victoria Lease
ad84f7f46b Merge "disable geofences for secondary users" into jb-mr1-dev 2012-11-07 13:56:46 -08:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
 2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Jeff Sharkey
ffe0cb49d1 Avoid recycling recently removed user IDs. 
Currently, installd doesn't correctly evict VFS cache entries for
FUSE emulated external storage.  This means zygote processes have an
inconsistent view of the FUSE daemon when the system rapidly
recycles user IDs.

To work around this, only consider recycling a user ID after its
VFS cache entries have expired.  The emulated storage FUSE daemon
currently uses a 'entry_valid' timeout of 10 seconds.

Bug: 7407902
Change-Id: Id80cbdd2215d8456467fb31e4c209ca12a505e16
 2012-11-07 11:30:39 -08:00
Jim Miller
c7dc250d5a am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:17:08 -08:00