8549 Commits

Author SHA1 Message Date
Siva Velusamy
4faaed97ab Merge "ActivityManager: add option to allow OpenGL trace." 2012-03-12 18:10:36 -07:00
Jeff Sharkey
b8c81768d9 Merge "Let <path-permission> block unprotected providers." 2012-03-12 17:54:33 -07:00
Dianne Hackborn
1743b64d87 Dejank: also animate window moves due to requested size changes.
This performance an animation when, for example, a dialog window is
moved because the size of its content has changed.

Change-Id: I2d79a1a57f94e0f2f8ef706a473fca6c9cc637cf
2012-03-12 17:04:43 -07:00
Daniel Lehmann
0e87370077 Remove the country detector logging
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
2012-03-12 17:04:17 -07:00
Glenn Kasten
81916df733 Clean up assertion checks
Use ALOG_ASSERT instead of assert.
Use compile-time asserts where appropriate.
Fix typo in an ALOGV.

Change-Id: I58f1c1ffc14319a022c88b5a88b8d0368660da8b
2012-03-12 15:56:50 -07:00
Glenn Kasten
9779e9f5ac Inline applyVolume() into threadLoop_mix()
Also the declaration of applyVolume in PlaybackThread was dead.

Change-Id: I4b1a9848d07d3d7f340baea05b17f667c78df868
2012-03-12 15:14:24 -07:00
Glenn Kasten
80515d2adf Merge "Remove unnecessary friend declarations" 2012-03-12 15:05:51 -07:00
Glenn Kasten
db9c21e754 Merge "Remove virtual from methods that don't need it" 2012-03-12 15:05:21 -07:00
Jeff Sharkey
110a6b6252 Let <path-permission> block unprotected providers.
When accessing a ContentProvider that is unprotected by top-level
permissions, and caller doesn't hold a matching <path-permission>
permission, revoke the default top-level access.

This enables an otherwise unprotected provider to enforce permissions
on specific paths.

Bug: 6131916
Change-Id: Icab89f765ccd90b1acea6988b05f00877fe2c11e
2012-03-12 14:09:34 -07:00
Jeff Brown
a8c67eb904 Merge "Add Java wrappers for new atrace functionality." 2012-03-12 13:25:27 -07:00
Siva Velusamy
92a8b22e74 ActivityManager: add option to allow OpenGL trace.
This patch adds an option to enable tracing of OpenGL functions.
OpenGL tracing can be enabled by passing "--opengl-trace" option
to am start.  This option requires either a device in debug mode,
or that the application itself has debug permission set.

Change-Id: I77788bfe97c9108943b1f947ce81afe8293d78a0
2012-03-12 12:18:53 -07:00
Glenn Kasten
0fe52c8be8 Merge dup code at thread entry and param change
This CL is mostly just cleanup, but there are a couple of fixes marked
"FIX" below.

Merge the duplicate code that was at the beginning of threadLoop() and
after a parameter change.  cacheParameters_l() is now called at entry to
threadLoop() and after any parameter change.  It re-calculates all values
that are derived from parameters, and caches them in instance variables.

updateWaitTime_l():
 - FIX activeSleepTime depends on mWaitTimeMs, which was initially set
   to infinity.  updateWaitTime_l() was not called at entry to
   threadLoop(), so activeSleepTime was not set correctly before the
   first parameter change.

 - FIX reversed the order of calls after parameter change
   for the same reason so that updateWaitTime_l() is called before
   calculating values that are derived from wait time.

 - marked it private since now it's only called from DuplicatingThread

Change-Id: If2607d2ed66c6893d910433e48208a93c41fb7e9
2012-03-12 08:58:26 -07:00
Jeff Sharkey
ce8668f809 Merge "Save timezone when setting data cycle reset date." 2012-03-09 18:33:44 -08:00
Jeff Sharkey
9bf3150cfa Save timezone when setting data cycle reset date.
Instead of cycle reset at midnight UTC, use midnight of timezone
active when user last set cycle reset date.  Tests to verify, and
also to test leap year behavior.

Bug: 5938567
Change-Id: Ie06f7f0fa242d23110f9586a3f4f7037af87b31b
2012-03-09 17:10:05 -08:00
Jeff Brown
481c1570dc Add Java wrappers for new atrace functionality.
Instrument a few parts of the input dispatcher and the
view hierarchy.

Change-Id: I49285c9fb3502253baa1ffed60f521b8c24fccaf
2012-03-09 15:43:50 -08:00
Glenn Kasten
28b269f341 Use audio_policy_output_flags_t consistently
This affects:
 - IAudioFlinger::openOutput
 - AudioTrack::AudioTrack
 - AudioTrack::set
 - apps that call these

Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
2012-03-09 15:32:22 -08:00
Craig Mautner
466608e9e8 Merge "Fix state machine sequence causing wallpaper flash." 2012-03-09 14:40:45 -08:00
Craig Mautner
ad3a9bb628 Fix state machine sequence causing wallpaper flash.
Fixes bug 6127355.

Change-Id: Ie6894329829f78b3ff8936cfe5ed2933490db5d8
2012-03-09 14:32:06 -08:00
Glenn Kasten
e61e667d53 Merge "Replace hard-coded 3 by FCC_2 to simplify searches" 2012-03-09 13:44:14 -08:00
Glenn Kasten
8d8557ad57 Remove virtual from methods that don't need it
Change-Id: I30e17e61aae25b036436c0e270313c80c43e5f06
2012-03-09 12:48:18 -08:00
Glenn Kasten
b3030f9b46 Remove unnecessary friend declarations
Add comments to the remaining friends, so we know what is left if we
decide to remove them later.

Change-Id: I1de929257dc4700960f77902cda3d303177c72cf
2012-03-09 12:18:48 -08:00
Dianne Hackborn
55b4b28606 Merge "Improved rotation animation." 2012-03-09 11:40:23 -08:00
Dianne Hackborn
191874e371 Improved rotation animation.
Change-Id: Id21686be8b2b229dc61c5d01f888c9b5deabb857
2012-03-09 11:20:54 -08:00
Irfan Sheriff
d4933842b1 Merge "Fix softap start" 2012-03-09 11:06:42 -08:00
Irfan Sheriff
e4aecb671b Fix softap start
Remove the unncessary "softap start" which was used for broadcom
specific implementation

Change-Id: I79458082a116cd630bd13d1ed1a237eda7daaa88
2012-03-09 11:01:01 -08:00
Glenn Kasten
a9821bdd02 Merge "Don't ask policy manager about invalid stream type" 2012-03-09 07:19:43 -08:00
Glenn Kasten
1e8b118a40 Merge "AudioPolicyService InputDesc minor cleanup" 2012-03-09 07:19:17 -08:00
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
Glenn Kasten
fcf2ac041e AudioPolicyService InputDesc minor cleanup
Add a non-default constructor to set the mSessionId, and make mSessionId const.

Remove explicit clear on mEffects - it is automatically cleared by the destructor.

AudioPolicyService::setPreProcessorEnabled:
 - parameter is const *
 - use an alias instead of making a Vector copy

Destructor doesn't need to be virtual since there are no subclasses.

Change-Id: Ibc3c3bea8259839430b1cf5356186c7d96f1082f
2012-03-08 16:30:00 -08:00
Jeff Brown
df813c03b1 Merge "Use the Choreographer for Drawable animations." 2012-03-08 16:28:48 -08:00
Glenn Kasten
d8f32c2989 Replace hard-coded 3 by FCC_2 to simplify searches
Change-Id: I92881d04e8378307f849fb343071a58d181a68b4
2012-03-08 16:18:57 -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
12f32d6659 Don't ask policy manager about invalid stream type
Change-Id: If50fbff9d34045d1398984da48da7e6428a74491
2012-03-07 16:36:23 -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