8502 Commits

Author SHA1 Message Date
Craig Mautner
d3ae220286 Merge "Fix flickering when starting and ending apps." 2012-03-20 12:46:48 -07:00
Craig Mautner
22ce1414a0 Fix flickering when starting and ending apps.
Surfaces were displaying animations in their entirety for a single
frame before the animation kicked in. This caused a flash on the
screen. By setting the animation to invisible (alpha=0) at their
start it makes no difference if they are displayed.

Fixed bug 6176540.

Removed redundant mDimAnimator.show call.

Change-Id: I47c1b0d38273b011d9115822a8476671d6a050fc
2012-03-20 10:16:26 -07:00
Jeff Sharkey
09f5aededa Merge "Selective enforcement of READ_EXTERNAL_STORAGE." 2012-03-19 19:24:04 -07:00
Jeff Sharkey
edc84ee839 Selective enforcement of READ_EXTERNAL_STORAGE.
Store enforcement state of specific permissions, allowing them to be
selectively enforced. Currently supports READ_EXTERNAL_STORAGE, which
by default isn't enforced, but enforcement can be enabled at runtime.

Bug: 6131916
Change-Id: I4bcc215a2eb5e6507d6257b577311cbd13c77acf
2012-03-19 19:01:45 -07:00
Dianne Hackborn
f1bdf65308 Merge "Start using the new activity options argument." 2012-03-19 18:21:12 -07:00
Glenn Kasten
f743e1f6ab Whitespace
Fix indentation, and add blank lines in key places for clarity

Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
2012-03-19 17:53:33 -07:00
Dianne Hackborn
7a2195cdd3 Start using the new activity options argument.
New class lets you make an options bundle defining a custom animation,
as an alternative to Activity.overridePendingTransition().

Change-Id: I8e209bf52398a98ab9f1bcafa1ec0a580dae57c0
2012-03-19 17:41:10 -07:00
Glenn Kasten
d10ca466db Add libmedia_native
Change-Id: I3ac357c78fb89f108d15c6e5b9fa317de0e9fb9a
2012-03-19 17:36:25 -07:00
Glenn Kasten
4d3f82e8d9 Merge "Add libmedia_native" 2012-03-19 16:21:04 -07:00
Glenn Kasten
76b6c0c1f5 Update comments
Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
2012-03-19 14:12:01 -07:00
Glenn Kasten
44c71fa11a new doesn't fail on Android
Change-Id: I5079a3bf31097dd0807b2d806d5f8d3cff2077ab
2012-03-19 10:50:57 -07:00
Glenn Kasten
84569cc4e1 IAudioFlinger::createTrack and openRecord flags
createTrack and openRecord don't need the "old" flags parameter,
which was either audio_policy_output_t or audio_in_acoustics_t
shifted left by 16 bits.  But they do need "new" flags, which
are defined by the application use case.  Initially, the only
application use case flag is timed output, but others are planned.

For output, the audio_policy_output_t flags are passed to
AudioSystem::getOutput, which returns an audio_io_handle_t, and that
handle is then passed to createTrack. So createTrack doesn't need the
old flags parameter.

For input, the audio_in_acoustics_t flags are passed to
AudioSystem::getInput, which returns an audio_io_handle_t, and that
handle is then passed to openRecord. So openRecord doesn't need the
old flags parameter.

Change-Id: I18a9870911846cca69d420c19fe6a9face2fe8c4
2012-03-19 09:04:23 -07:00
Eric Laurent
165ee4c53d am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
  audioflinger: fix issue with camcorder and A2DP
2012-03-19 08:34:56 -07:00
Eric Laurent
10c3fc89a4 audioflinger: fix issue with camcorder and A2DP
Some audio HALs do not support well a device selection of 0 (no device)
received on an input stream.

This can happen because of a problem in the audioflinger code that handles
the forwarding of the output device selection to the record thread for use by
the pre processing modules that need it. If the output device is 0 (meaning
no op, which happens when stopping playback over A2DP) audioflinger could not
detect it was an output device selection and would forward it to the input
stream (see AudioFlinger::setParameters() and RecordThread::checkForNewParameters_l().

Issue 6179641.

Change-Id: Idae534521866538e0d12ba259a2834f402a922e2
2012-03-16 20:37:59 -07:00
Dianne Hackborn
dea50f05e4 Merge "More work on rotation animation." 2012-03-16 18:29:16 -07:00
Dianne Hackborn
d6b32b6178 More work on rotation animation.
Change-Id: Ib8206db98b68cb1e0b16e4c55d949e80ff31bd9f
2012-03-16 18:20:07 -07:00
Craig Mautner
d87eb6c7c6 Merge "Fix black screen on app transition." 2012-03-16 15:35:21 -07:00
Craig Mautner
0059d3508f Fix black screen on app transition.
The layer adjustment to an animating window upon completion was masking
the window behind the mWindowAnimationBackgroundSurface, a DimSurface.
The DimSurface was not being hidden because the step was happening too
late. Swapping the order of performAnimationsLocked and
updateWindowsAppsAndRotationAnimationsLocked fixes this ordering issue.

Fixes bug 6185920.

Change-Id: I0ff64c019e821fa3a92505ac6351f2648897e592
2012-03-16 15:26:01 -07:00
Dianne Hackborn
baad5d5f0d Merge "resolved conflicts for merge of 354e0346 to master" 2012-03-16 15:19:51 -07:00
Dianne Hackborn
29ba7e6680 resolved conflicts for merge of 354e0346 to master
Change-Id: I432f5f43aa1e19c6a474e8656fe0e3715828e8af
2012-03-16 15:03:36 -07:00
Craig Mautner
1dd3ed09e8 Perform finish animation actions.
When stepAnimation returns false, do not return false immediately.
Instead carry out finish actions. Also, remove state machine that is no
longer necessary.

Fixes bug 6184070.

Change-Id: I530eb2b62b864bbce929f573d10b31b102152f1f
2012-03-16 14:05:07 -07:00
Dianne Hackborn
c032a73b51 am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1
* commit 'ce06c000b4133c63414c3244c3325e25315ab179':
  Debugging code for #6169553: Make Phone launch faster
2012-03-16 11:55:05 -07:00
Glenn Kasten
ae75f994cc Add libmedia_native
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
2012-03-16 11:51:30 -07:00
Jeff Sharkey
2937a9ea0a Merge "Combine network subtypes by default." 2012-03-16 11:40:40 -07:00
Jeff Sharkey
d4dd7716fb Combine network subtypes by default.
Subtype controls (3G-vs-4G) aren't exposed in the UI, so tracking
data with that granularity creates unnecessary overhead. For example,
some GSM networks can regularly flap between two subtypes.

Bug: 6118868
Change-Id: Id098891dba52336d00d0f96632a7924e228b4713
2012-03-16 11:35:29 -07:00
Wu-cheng Li
8d3c318b2d Merge "Add a new camera open API that allows taking the ownership." 2012-03-15 21:23:24 -07:00
Dianne Hackborn
fe4afa1535 Merge "Fix swiping away recents to always kill processes." 2012-03-15 15:50:43 -07:00
Dianne Hackborn
2a29b3ad13 Debugging code for #6169553: Make Phone launch faster
The activity manager now has a tick when launching an app every
500ms, where it collects the current stack traces of the app if
it hasn't finished launching.  These traces are included as part
of dumpstate.

This is only done on non-user builds.

Change-Id: I7f09ea00aab821ac81795f48c9d68fcca65f89fe
2012-03-15 15:48:38 -07:00
Dianne Hackborn
9da2d40334 Fix swiping away recents to always kill processes.
This would only kill processes if there were activities associated
with the recent task; now it always kills processes.

Always fix some debug output.

Change-Id: Iccda19ba0a20823347b06c13b450587283d28284
2012-03-15 13:43:08 -07:00
Craig Mautner
bf90eaa5d2 Separate layout ops from surface ops.
Further work to isolate layout from animation and surface operations.
Remove cruft and minor refactoring.

Change-Id: I6f910ed72c7c614996641c353870c2b2ab5e8bb4
2012-03-15 11:34:24 -07:00
Glenn Kasten
4513bc0f28 Merge "Remove dependency on audio_* location" 2012-03-15 07:53:54 -07:00
Wu-cheng Li
a1c41e13b5 Add a new camera open API that allows taking the ownership.
The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.

bug:5584464

Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
2012-03-15 14:50:48 +08:00
Craig Mautner
f44882ff1c Merge "Separate out animations from layout." 2012-03-14 16:55:58 -07:00
Glenn Kasten
4e42c5f41f Remove dependency on audio_* location
Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
2012-03-14 16:44:34 -07:00
Glenn Kasten
81fe4fbd6b Merge "AudioFlinger playback thread CPU measurement in Hz" 2012-03-14 16:28:38 -07:00
Craig Mautner
e32c307841 Separate out animations from layout.
(Dianne) pulled the animation steps out of the layout. Changes to
exposed layers cause repeated calls to layout code.

Combined animation steps into start and finish animation code.

Change-Id: I3602d1d6249d20987d102a54e3a67a7a39361b55
2012-03-14 16:09:28 -07:00
Glenn Kasten
f57e2bceb9 AudioFlinger playback thread CPU measurement in Hz
Log statistics on CPU usage in Hz in addition to wall clock time

Use CPU statistics for all playback threads, not just MIXER
(but they are disabled by default by a compile-time debug macro).

ThreadCpuUsage library:
 - Move statistics out of the library and leave that up to the caller
 - Add API to determine a CPU's frequency

Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
2012-03-14 16:03:01 -07:00
Eric Laurent
5b9e0684fe Merge "audioflinger: more info in dumpsys" 2012-03-14 15:30:05 -07:00
Eric Laurent
0194a0d0dd audioflinger: more info in dumpsys
Added TID and io handle to AudioFlinger threads dump.

Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
2012-03-14 15:04:54 -07:00
Glenn Kasten
58984b0738 Merge "Break circular dependency on media player service" 2012-03-14 13:57:03 -07:00
Dianne Hackborn
a4972e951b Add new "options" argument to all startActivity APIs.
This will be used to allow new features to be requested...  such as,
say, a special kind of animation.  Right now there are no options
defined.

Change-Id: I4eb6f27275cdd4bf186f6da316ab93a2372ad4b7
2012-03-14 12:57:14 -07:00
Glenn Kasten
0e9ce2e387 Break circular dependency on media player service
Bug: 6165157
Change-Id: I3c85bbcaf31f3cb9a009e273f7b6284015eb3bd8
2012-03-13 17:55:35 -07:00
Robert Greenwalt
8e94c25f5d Merge "Record the trimmed cmd string for logs" 2012-03-13 14:13:07 -07:00
Robert Greenwalt
d192598d3e Record the trimmed cmd string for logs
The over the wire command includes a \0 that mangles log messages.
bug:6149176

Change-Id: I77d4e443f1966bff060f1b97570851f7549fee8e
2012-03-13 12:30:14 -07:00
Craig Mautner
a1b09a92d8 Merge "Set the reason for screen-off before usage." 2012-03-13 12:21:09 -07:00
Craig Mautner
44bf70fba2 Set the reason for screen-off before usage.
An occasional call sequence through updateLightsLocked ended up storing
the old screen-off reason rather than the current screen-off reason.
This caused the Keyguard screen to be bypassed when turning back on. By
saving the power-off reason in mScreenOffReason prior to calling
updateLightsLocked we eliminate this problem.

The offending calling sequence was:
  PowerManagerService.setPowerState(..., reason) => updateLightsLocked
  => animateTo => screenOffFinishedAminatingLocked(mScreenOffReason)
  => sendNotificationLocked.

Change-Id: I8ee0b3226f94af7ff7e7b7b0bf54e47fd0c03631
2012-03-13 11:38:38 -07:00
Glenn Kasten
18db49a462 Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
  sp< not sp < to
  "switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.

Use git diff -b or -w to verify.

Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
2012-03-13 11:09:47 -07:00
Glenn Kasten
f4c072d421 Merge "Clean up assertion checks" 2012-03-13 07:16:44 -07:00
Daniel Lehmann
e024749830 am 8f30d219: am f0533f94: am 0e873700: Remove the country detector logging
* commit '8f30d2191eb88d577d6d2ba9874053cfea0091c8':
  Remove the country detector logging
2012-03-12 18:30:17 -07:00
Daniel Lehmann
f0533f9462 am 0e873700: Remove the country detector logging
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
  Remove the country detector logging
2012-03-12 18:24:41 -07:00