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

9599 Commits

Author SHA1 Message Date
Michael Jurka
3366a5d54e am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:34:20 -08:00
Michael Jurka
cf474b1a10 am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:31:07 -08:00
Michael Jurka
7b0c877959 Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 2012-11-16 15:29:17 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Amith Yamasani
8f97174a9c am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit '4ad8a4bd89c0a93705864e9beda39065b34545d6':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:50:29 -08:00
Amith Yamasani
4ad8a4bd89 am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit 'acddb72c58dbab029d1acbaea61755e79ef8b2a4':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:47:11 -08:00
Amith Yamasani
acddb72c58 Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 2012-11-16 10:43:48 -08:00
Adam Cohen
a2d250791d am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '5a0f5ba269c12889246acbbe546ef75285231430':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-15 15:02:16 -08:00
Adam Cohen
5a0f5ba269 am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '6189888a2565b6362b0dd022850b748f628500d0':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-15 14:59:33 -08:00
Adam Cohen
6189888a25 Merge "Making sure launcher doesn't show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-15 14:56:19 -08:00
Adam Cohen
3fcc6b26c3 Making sure launcher doesn't show keyguard-only widgets (issue 7550090) 
Change-Id: I5d0675f0c03677e06371a6730209c3466c6b0f15
 2012-11-15 14:53:31 -08:00
Amith Yamasani
bc9625059b Make sure that the owner user is marked initialized. 
This is required for upgrades from previous versions of JB.

Bug: 7547639
Change-Id: I21de14a70d6ba2ab21437b5f0721321df45226d2
 2012-11-15 14:43:13 -08:00
Adam Cohen
af958dce34 am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'b82ee0c7bb7fc3ef61e0c31193641e87aecddfe6':
  Pushing state persistence to a background thread
 2012-11-15 13:59:25 -08:00
Adam Cohen
b82ee0c7bb am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'b02eb4bb7d09a19aedb9dbc08b0f731af05a8579':
  Pushing state persistence to a background thread
 2012-11-15 13:55:45 -08:00
Adam Cohen
b02eb4bb7d Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 2012-11-15 13:53:53 -08:00
Adam Cohen
a1a2f967e2 Pushing state persistence to a background thread 
Change-Id: If776bc22c48525ba91dc7e4dd0e27de92612f2f5
 2012-11-15 13:44:34 -08:00
Jeff Sharkey
9634e97067 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
 2012-11-15 11:56:19 -08:00
Jeff Sharkey
91b5729323 am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit '64f369a542952a8ac0d22d7d6c4c793a29ebfc52':
  Avoid runtime restart after vold reconnects.
 2012-11-15 11:54:38 -08:00
Jeff Sharkey
bfea4f04f2 am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
  Useful annotations for code documentation.
 2012-11-15 11:53:19 -08:00
Jeff Sharkey
f838eb40e8 am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'fa0fb7c508dfa4275389a52b7c7907d2032f4aaa':
  Reduce verbosity of service event logging.
 2012-11-15 11:51:45 -08:00
Jeff Sharkey
64f369a542 am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit 'a319d655e336ffb0fcbee65b77926a32660c7f3f':
  Avoid runtime restart after vold reconnects.
 2012-11-15 11:51:33 -08:00
Jeff Sharkey
f5377a7242 Merge "Useful annotations for code documentation." into jb-mr1.1-dev 2012-11-15 11:48:38 -08:00
Jeff Sharkey
fa0fb7c508 am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'f6ba84b4242419f4765e0efcb5df82e37ad03faa':
  Reduce verbosity of service event logging.
 2012-11-15 11:47:40 -08:00
Jeff Sharkey
a319d655e3 Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 2012-11-15 11:46:19 -08:00
Jeff Sharkey
f6ba84b424 Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 2012-11-15 11:44:13 -08: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
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
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
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