8756 Commits

Author SHA1 Message Date
Glenn Kasten
c920dee060 AudioFlinger does not need libmedia any more
Change-Id: Ifd2c61882109ec36ca68072a2bf6506e08c8cf34
2012-03-22 15:24:22 -07:00
Jeff Sharkey
cae04a29da NetworkPolicy multi-user tests.
Bug: 6214004
Change-Id: If13023a689dadfefe1475e0ef2f192922f2e7753
2012-03-22 15:18:57 -07:00
Mike Lockwood
ced11a5bc4 Merge changes I35a76a27,I04bb7ad4,If38a1a10,Ice5be6e5,I009e443f,I968ddf90,I69d4e518,I09b1dfc9
* changes:
  Merge commit '74803dc'
  add config_bluetooth_default_profiles config var and use it to disable bt profiles
  Do not allow Surface creation on machines without SurfaceFlinger We will fail later anyways, but this change makes it much easier to track down places where we are inadvertently doing operations that depend on the flinger.
  fix setting only usb mode
  Detect (at runtime) kernel support for the "hdmi_audio" switch.
  Add a config resource to disable key-chord screenshotting
  Do not assume that there is always a running activity (Necessary for headless devices)
  Add batch volume adjust support to adjustMasterVolume() in AudioManager and AudioService.
2012-03-22 15:16:03 -07:00
Mike Lockwood
11c0ab9a08 Merge "ActivityManagerService: Disable app crashed dialog on headless builds" 2012-03-22 15:13:20 -07:00
Amith Yamasani
ad812a23df Merge "Package restrictions per user" 2012-03-22 15:11:51 -07:00
RoboErik
dab2072365 fix setting only usb mode
If you cleared the last usb mode it would fail (and so would setting
it if you started with none). This fixes it to set and unset the
last property correctly.

Change-Id: Ice5be6e57b6ca6b8c9241b0ac62071a3bc72606a
2012-03-22 15:09:36 -07:00
John Grossman
5e64321ebf Detect (at runtime) kernel support for the "hdmi_audio" switch.
A new switch was introduced in AndroidAtHome to deal with a race
condition between the WiredAccessoryObserver and the HW composer HAL.
When the new switch ("hdmi_audio") is present, we want to pay
attention to it instead of paying attention to the old switch
("hdmi").  This change checks at startup for the presence or absence
of the new switch and uses it if available, otherwise it falls back on
classic behavior.

see change ID I960cfc2f3e8df5342e7248a26fd313fdad2ca322 for the kernel
side changes.

see bug 6023647 for a discussion of the issue.

Change-Id: I009e443f25662e7beb233e892ca71034b05ebfc2
Signed-off-by: John Grossman <johngro@google.com>
2012-03-22 15:09:29 -07:00
Kevin Hester-Chow
d87a9be444 Do not assume that there is always a running activity
(Necessary for headless devices)

Change-Id: I69d4e518df99a02f2fbf19a9d86a693cea292f80
2012-03-22 15:09:21 -07:00
Mike Lockwood
86548c472a ActivityManagerService: Disable app crashed dialog on headless builds
Change-Id: I78bf2cb2cd9f99db57f447b7bfaca80c4fefbd66
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-03-22 15:09:00 -07:00
Jeff Sharkey
4b63d69759 Fix test breakage.
Change-Id: I2c5fc8c3bf7795ccdd474caa3f858e9a56f026ed
2012-03-22 12:36:45 -07:00
Jeff Sharkey
370f2dbc37 Merge "Move network policy to per-appId (instead of UID)." 2012-03-22 11:13:54 -07:00
Jeff Sharkey
8a8b581e66 Move network policy to per-appId (instead of UID).
To support multi-user, store network policy per-appId and expand to
apply rules to all UserInfo on device.

Bug: 6140462
Change-Id: Ic0866b4d41c8c60cc1c0a597f0de927b92b65b1e
2012-03-22 11:02:43 -07:00
Amith Yamasani
483f3b06ea Package restrictions per user
Packages can be enabled/disabled per user.
This requires maintaining stopped/launched states and
enabled / disabled components and packages per user.

Refactored pm.Settings and PackageSettingsBase to keep
track of states per user.

Migrated the stopped-packages.xml to users/<u>/package-restrictions.xml

Changed intent resolution to handle individual user restrictions.
Bunch of IPackageManager calls now have a userId argument.
Make AppWidgetService handle removals of packages.

Added some tests for pm.Settings and PackageManager.

Change-Id: Ia83b529e1df88dbcb3bd55ebfc952a6e9b20e861
2012-03-22 10:08:24 -07:00
Craig Mautner
03273d00ce Continue animations started from AppWindowToken.
Animations that were started from AppWindowToken.showAllWindowsLocked
were not setting mInnerFields.mAnimating and hence the animations were
not progressing. This resulted in popups such as menus and time/date
settings not showing up.

Fixes bug 6205076.

Change-Id: I4daae5895e64182328671e282331f14dd5561d5e
2012-03-21 11:52:40 -07:00
Craig Mautner
6d332c5148 Merge "Minor refactoring prior to major refactoring." 2012-03-21 09:21:39 -07:00
Glenn Kasten
4351d4aa8e Merge "Clean up Track constructor" 2012-03-21 08:29:18 -07:00
Glenn Kasten
004f9bac41 Merge "AudioMixer can be configured for fewer max tracks" 2012-03-21 08:19:04 -07:00
Glenn Kasten
652e18d896 Merge "Update comments" 2012-03-21 07:24:21 -07:00
Glenn Kasten
32d72b2f53 Merge "Whitespace" 2012-03-21 07:22:40 -07:00
Glenn Kasten
85b51b8ae3 Merge "new doesn't fail on Android" 2012-03-21 07:21:21 -07:00
Eric Laurent
c485824804 am a48285c4: am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit 'a48285c4f22ffc43f1771ebd1ff35dcec48db2c7':
  audioflinger: fix issue with camcorder and A2DP
2012-03-20 19:35:53 -07:00
Jeff Sharkey
e5b2b644b1 Merge "Remove unused android.net.Downloads." 2012-03-20 18:00:29 -07:00
Jeff Sharkey
948eef8254 Remove unused android.net.Downloads.
It's another set of constants that can be confused with those in
android.provider.Downloads.

Change-Id: I78ac058fa264d59a81f7655ab101c3fb2c8c17ff
2012-03-20 17:58:27 -07:00
Jeff Sharkey
3a66cf3e86 Avoid data usage notifications in airplane mode.
Only for mobile networks.

Bug: 5995839
Change-Id: I6a6dba8cfe98c8e72861f90665c3e41da6d9a474
2012-03-20 17:45:23 -07:00
Glenn Kasten
25f1bc43f8 AudioMixer can be configured for fewer max tracks
Change-Id: I371b17cef071d083eecf35cd3627a3adff907a33
2012-03-20 17:27:10 -07:00
Craig Mautner
2fb98b147b Minor refactoring prior to major refactoring.
Removal of blur layer.
Deferral of Surface actions in BlackFrame from ctor to first use.
Combine common test into single method okToDisplay().
Remove redundant logic in DimAnimator.

Change-Id: I43af0415794a8f142803ce94d7e17539aafac67d
2012-03-20 17:24:00 -07:00
Glenn Kasten
e9b2b3be13 Clean up Track constructor
The 'thread' parameter can never be NULL.
Use constructor initialization list when possible.
Make more members const.
Only put the relevant code under "if (mCblk != NULL)".
Add comment about track name leak.

Change-Id: Ib963390a69bed1999638cc982a759edd1d5f4712
2012-03-20 17:15:12 -07:00
Jeff Sharkey
481cb7ea38 Merge "Remember when NetworkPolicy was inferred." 2012-03-20 16:54:51 -07:00
Jeff Sharkey
837f9242ae Remember when NetworkPolicy was inferred.
This helps future-proof NPMS if we need to correct default policies
after an upgrade.

Change-Id: I0ddfdeaf41757a46aeb867c91d495ccf981d544b
2012-03-20 16:52:20 -07:00
Glenn Kasten
d046324582 Merge "Add libmedia_native" 2012-03-20 14:01:39 -07:00
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
Christopher Tate
9ce685b934 Make immersive mode public & imply update locking
Activity.setImmersive(boolean) / android:immersive="bool" are now public.
In addition, if the foreground activity is immersive then an update lock
will be held on its behalf.  This lets applications such as movie players
suppress the display of intrusive notifications, OTA-availability dialogs,
and the like while they are displaying content that ought not to be
rudely interrupted.

The update lock aspect of this mode is *advisory*, not binding -- the
update mechanism is not actually constrained; it simply uses this information
in deciding whether/when to prompt the user.  It's more a guideline than
a rule.

Bug 6154438

Change-Id: Ibd3491fc437077f3fa0d9708ed91955121e8c877
2012-03-19 18:37:57 -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
179239bc6c 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:03 -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