11818 Commits

Author SHA1 Message Date
Björn Lundén
1129a85203 Framework: Use holo alert drawables
Replaces the current usage of the GB alert
drawable with theme-consistent holo ones.

Change-Id: I8594ef8276db5bb0e192f3a541937d7281321043
2012-11-15 15:32:02 +01:00
Daniel Sandler
8ff32d8113 am 00679b5b: am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev
* commit '00679b5b467dbc19ce2223b5501976c5c3f66fa9':
  Do not vibe when the default notification sound is Silent.
2012-11-15 06:17:35 -08:00
Daniel Sandler
1812b34503 am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev
* commit '2bb5dc6a367ce869939728b2978be7ca61a4b8b8':
  Notification vibration improvements:
2012-11-15 06:17:31 -08:00
Daniel Sandler
00679b5b46 am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev
* commit '020d65290a6fe7dc5465d36c259ec62dcfd71c1f':
  Do not vibe when the default notification sound is Silent.
2012-11-15 06:13:50 -08:00
Daniel Sandler
2bb5dc6a36 am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev
* commit '83b2596155ec1845194c08bd27a6e8dfbeb530b9':
  Notification vibration improvements:
2012-11-15 06:13:46 -08:00
Daniel Sandler
020d65290a Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 2012-11-15 05:05:44 -08:00
Daniel Sandler
83b2596155 Merge "Notification vibration improvements:" into jb-mr1.1-dev 2012-11-15 05:03:11 -08:00
Zhihai Xu
681ae7fc5e Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
The root cause is we can't unbind blue service when bluetooth isnot disbaled
Otherwise the bluedroid stack will be out of sync with bluetooth service
only unbind bluetoothservice, when bluetooth is at OFF state.

bug 7376846

Change-Id: If5a11926f77a1ac29e75cdddbf5e90d492179f43
2012-11-14 18:05:29 -08:00
Jeff Sharkey
0be607cda1 Avoid runtime restart after vold reconnects.
Rely on behavior of already-released CountDownLatch instead of
clearing the reference.

Bug: 7290521
Change-Id: I787e673b97d18be412d5b37e279fbf1275b49151
2012-11-14 14:39:19 -08:00
Daniel Sandler
d4d2de2a77 Do not vibe when the default notification sound is Silent.
(This relates to the new vibration fallback behavior, where
notifications that expect to make a sound should always
vibrate in vibrate mode. We should not vibrate if the
notification's sound is silent, but we should also not
vibrate if the notification uses the default sound and the
default is silent.)

Bug: 7537077
Change-Id: I08e149c8c00ef2d2f61e418d88a086cb5e9cf241
2012-11-14 16:42:04 -05: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
Daniel Sandler
edbb380950 Notification vibration improvements:
- When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use a different
   vibration pattern.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
2012-11-14 11:50:11 -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
Zhihai Xu
4e22ad3504 Settings shows it is connected to A2DP, though the device is not actually connected
the root cause is the A2dp and Pbap service need receive STATE_TURNING_OFF intent
to shutdown cleanly. So we need send completely state transition intents
in user switch handler.

bug7403171

Change-Id: Ic92bc85c2b74ae7c95440b237ea8851771ee9f04
2012-11-13 15:11:26 -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
8b2c3a1460 Useful annotations for code documentation.
Bug: 6537978
Change-Id: I806c3c09e3255f8789455f13bf37c1dde2a93f1f
2012-11-12 12:42:17 -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
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
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
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
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
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
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
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