8368 Commits

Author SHA1 Message Date
Dianne Hackborn
8931da12e8 Merge "Fix crash." 2012-03-08 19:27:21 -08:00
Dianne Hackborn
d9781fe7ee Fix crash.
Change-Id: Id219351625494c54524e400055755d41f3bef868
2012-03-08 18:04:18 -08:00
Eric Laurent
d10a5992f9 Merge "audio policy: use audio_devices_t when appropriate" 2012-03-08 17:45:44 -08:00
Jeff Brown
df813c03b1 Merge "Use the Choreographer for Drawable animations." 2012-03-08 16:28:48 -08:00
Eric Laurent
c9ab9f5c2c audio policy: use audio_devices_t when appropriate
Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
2012-03-08 15:57:09 -08:00
Amith Yamasani
28ca8f9f95 Merge "Make SyncManager and AccountManagerService multi-user aware." 2012-03-08 15:55:20 -08:00
Romain Guy
583fcb9175 Merge "Dispatch screen state change events to Views Bug #6120957" 2012-03-08 15:06:50 -08:00
Romain Guy
bb9908b828 Dispatch screen state change events to Views
Bug #6120957

Using this new callback, views can interrupt and resume their
animations or other periodic tasks based on the current state
of the display.

Change-Id: I398f4abd421e9c5f207107bf1009a7b92cf45daa
2012-03-08 15:05:12 -08:00
Mathias Agopian
7d8775a87e Merge changes I140d291e,Id443ec5c
* changes:
  remove files that moved to frameworks/native
  fixup hardcoded include paths for new project
2012-03-08 14:45:51 -08:00
Dianne Hackborn
21c241e061 Add new Intent API for associating a ClipData with an Intent.
Allows applications to propagate multiple URI grants through an
Intent.

Later on, we should probably redefine the share actions to be
based on this ClipData with the old extras-based approach only
there for compatibility.  Even if we don't do that, though, this
allows you to do a multi-select share that grants multiple URI
permissions by stuffing the URIs in a ClipData.

Also add some documentation in various places telling people how
they can grant URI permissions.

Change-Id: Id4ba8e72c11caf7e1f1f438cb7af058d1586a37c
2012-03-08 14:34:03 -08:00
Amith Yamasani
04e0d265e3 Make SyncManager and AccountManagerService multi-user aware.
AccountManagerService
- Maintain multiple account lists, one per user
- Keep multiple databases of accounts
- Account db moved to /data/system/users/<userid>/

SyncManager
- SyncStorageEngine keeps track of multiple users' accounts.
- SyncQueue maintained as a single instance, queueing requests from
  multiple users.
- Changed some methods to take userId arguments
- Removed some deadc0de
- Store the userId in the SyncOperation, so we know which provider
  instance to bind to when queued operations are processed.

ContentService
- Pass along the userid to sync manager calls.

ActivityManagerService:
- Fixed a bug in cancelIntentSender
- Don't bring other user's task forward when resetting tasks.

Updated tests

Change-Id: If317340ef68e902787aa3f5ceb4cf96f14aea695
2012-03-08 10:52:36 -08:00
Romain Guy
250069bf6b Merge "Ignore draw requests when the display is off" 2012-03-08 10:47:02 -08:00
Glenn Kasten
a13446a8e2 Mixer status cleanup
Use mPrevMixerStatus for DirectOutputThread also.
Remove the MIXER_CONTINUE logic and use MIXER_IDLE instead.
Rename the field mixerStatus to mMixerStatus.
Rename local variable back to mixerStatus.

Change-Id: I0a8145fc856c6c5ff8b784b6176ef3c4d8eb7408
2012-03-08 07:52:57 -08:00
Glenn Kasten
59b86843dc Merge "Cleanup DirectOutputThread::mActiveTrack" 2012-03-08 07:14:45 -08:00
Mathias Agopian
8c79817dc6 remove files that moved to frameworks/native
Change-Id: I140d291e520097b1148930f736823650e08488f7
2012-03-07 19:36:08 -08:00
Jeff Brown
7ae9d5faad Use the Choreographer for Drawable animations.
Change-Id: Ifcbf33434bf3c32d1900fd0b3f5bde004604ce8a
2012-03-07 19:02:51 -08:00
Glenn Kasten
b8f96760dc Cleanup DirectOutputThread::mActiveTrack
Rename activeTrack to mActiveTrack.
Release the reference earlier, at the end of threadLoop_mix().
This allows the field to be made private and to
  move the declaration from PlaybackThread to DirectOutputThread.

Change-Id: I02be7a254638f7d85e92aaf0002d20ca0092a5c3
2012-03-07 17:05:59 -08:00
Selim Gurun
09ec58ea0f Merge "Prevent potential stall in dns proxy." 2012-03-07 17:04:52 -08:00
Glenn Kasten
78c914f37a Merge "IAudioFlingerClient::ioConfigChanged param2 const" 2012-03-07 16:08:59 -08:00
Jim Miller
8247add51d Merge "Fix 6119433: disambiguate screen brightness changes from other lights" 2012-03-07 15:21:31 -08:00
Jim Miller
18651804ff Fix 6119433: disambiguate screen brightness changes from other lights
This fixes a bug where the code asked to change the keyboard brightness
on a device that doesn't support it.  Instead of animating the keyboard
brightness, it ended up animating the display brightness and invoking
the power off animation as a result.  The fix is to ignore keyboard
brightness because we don't have any devices that currently support it.

Change-Id: I672d89f92f991812ea676f19c40058b2d3008656
2012-03-07 14:59:06 -08:00
Glenn Kasten
08d2c04194 Isolate references to outputTracks/mOutputTracks
Move all references to DuplicatingThread::outputTracks and
DuplicatingThread::mOutputTracks from the common threadLoop() into
virtual methods.  This allows them to be moved from PlaybackThread to
DuplicatingThread, and to be marked private.

Also use vector assignment to copy mOutputTracks to outputTracks.

Change-Id: Ieb1cf1ad36b8a65143e61e6c92a65fb43427e5e2
2012-03-07 11:04:55 -08:00
Glenn Kasten
9778bd1f33 Merge "Make applyVolume private to DirectOutputThread" 2012-03-07 10:44:29 -08:00
Glenn Kasten
e012783db8 Make applyVolume private to DirectOutputThread
Change-Id: I7ca4a59505857cbd106b6f274c66e9580dead271
2012-03-07 10:40:43 -08:00
Glenn Kasten
ed4271e1c1 Merge "Add comments about sequence for setting parameters" 2012-03-07 10:38:12 -08:00
Glenn Kasten
761415bd7f Merge the calls to prepareTracks_l
Change-Id: I1dd759581333e2908d980180d44db7bf5ed6591d
2012-03-07 07:28:12 -08:00
Jeff Sharkey
091ca2d5fb Merge "Avoid updating network stats after shutdown." 2012-03-06 20:04:26 -08:00
Jeff Sharkey
6341fcecc8 Avoid updating network stats after shutdown.
Bug: 6109476
Change-Id: I9a3a8b182c8fa56d83ddc755d204d5b267c9bc5d
2012-03-06 19:59:57 -08:00
Dianne Hackborn
5eb37241fe Merge "Work on more low memory reporting to apps." 2012-03-06 19:06:25 -08:00
Dianne Hackborn
27ff913d56 Work on more low memory reporting to apps.
There are now some new trim memory levels that are sent to
non-background applications as RAM becomes low.

There is a new API for an application to retrieve information
about memory trimming and such on demand.

Fixed various checks against the memory trim level to be
robust (not compare against exact values).

Change-Id: Ifd1c6151124350168aef20a94e517166fd2e03eb
2012-03-06 18:46:32 -08:00
Glenn Kasten
ffed04ac3c IAudioFlingerClient::ioConfigChanged param2 const
The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged
is used as an input.  So changed it from void * to const void *.
It is then cast to const OutputDescriptor *
or const audio_stream_type_t * depending on the event.

Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
2012-03-06 16:43:19 -08:00
Glenn Kasten
b7a4007563 Merge "Rename fields of AudioSessionRef" 2012-03-06 16:22:30 -08:00
Glenn Kasten
bf10657c8e Add comments about sequence for setting parameters
Change-Id: Iffa59a34c3c47bdc1d3234cdcb4d8ff99c102825
2012-03-06 16:18:17 -08:00
Glenn Kasten
6be5247cc5 Merge "Fix indentation for re-organized code" 2012-03-06 15:23:58 -08:00
Glenn Kasten
dbaf2cc1bf Merge "Rename updateWaitTime since a lock is held" 2012-03-06 13:44:56 -08:00
Glenn Kasten
2bad67f3e3 Rename updateWaitTime since a lock is held
Change-Id: I9bb978cbd0debf5b21676467060f72eebafea3e6
2012-03-06 12:46:21 -08:00
Glenn Kasten
26bbc5c0d3 Fix indentation for re-organized code
Change-Id: I63471cebdbd095b7ad4e481611b785f9b02c7941
2012-03-06 12:14:54 -08:00
Glenn Kasten
9a42ac982e Rename fields of AudioSessionRef
Change-Id: I9f2a66094135c4ac6bec2d3e9db3ac5fbf988ede
2012-03-06 11:43:55 -08:00
Robert Greenwalt
06402e91e9 Merge "Make NDC not block forever and handle restart." 2012-03-06 11:30:28 -08:00
Craig Mautner
135fb111df Merge "Fix deadlock by making DropBoxManager call async." 2012-03-06 11:12:40 -08:00
Dianne Hackborn
4f03d35f9c Merge "Fix issues #6103378 and #5959515." 2012-03-06 10:34:18 -08:00
Craig Mautner
26caf7adf6 Fix deadlock by making DropBoxManager call async.
Created a Handler and used it to make sendBroadcast call asynchronously.
Deadlock was caused by WindowManagerService Log.wtf call requiring
ActivityManagerService lock while holding its own lock. At the same time
ActivityManagerService was holding its lock while waiting for
WindowManagerService lock.

Tested by forcing a Log.wtf in
WindowManagerServices.updateWindowsAppsAndRotationAnimationsLocked
inside mAppTokens loop. Then ran 'adb shell monkey -v -v 500000'.
Without this fix it would lock up and reboot within a couple of minutes.
With this fix it runs until the Camera app crashes. But that's a
different bug...

Fixes bug 6112676.

Change-Id: I5b360aa08412d117b1765f01bacd931020509db7
2012-03-06 09:30:18 -08:00
Dianne Hackborn
6569625bee Fix issues #6103378 and #5959515.
Change-Id: I762d86dd7119c9ac02f4b8803c4a250c6b7637c7
6103378: APR: IOOBE at android.content.pm.PackageParser.generatePackageInfo(
    PackageParser.java:355)
5959515: PackageManager doesn't validate className in setComponentEnabledSetting
2012-03-05 18:49:21 -08:00
Mathias Agopian
4b97257979 Merge "fixup include paths" 2012-03-05 16:08:26 -08:00
Mathias Agopian
a1549ff1bf fixup include paths
- remove unneeded include deps
- remove some hardcoded include paths

Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
2012-03-05 15:59:38 -08:00
Romain Guy
7e4e561bc7 Ignore draw requests when the display is off
When WindowManagerService's events are enabled/disabled, the state of the
display is dispatched to the known windows. This allows ViewRootImpl to
ignore draw requests until the screen is turned back on. This can potentially
lead to significant battery savings. For instance, a launcher widget showing
a repeating animation will cause the CPU and the GPU to wake up regularly
without this change.
(Change submitted by Intel and merged manually)

Change-Id: I7f93b0e60c3e6de1705f619e80860c36b1cdb978
2012-03-05 14:37:29 -08:00
Dima Zavin
e78d7670ca Merge "PowerManagerService: only turn off screen when we really mean to" 2012-03-05 13:19:33 -08:00
Dima Zavin
d975403a2d PowerManagerService: only turn off screen when we really mean to
Change-Id: I8aa574b38a4d901fce91b6d7771207949f9c8044
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-05 13:13:33 -08:00
Glenn Kasten
c8a0a15994 Merge "threadLoop merge" 2012-03-05 12:18:14 -08:00
Dianne Hackborn
c3b91e9afd Merge "More work on rotation animation." 2012-03-05 11:45:19 -08:00