73466 Commits

Author SHA1 Message Date
Christopher Tate
9c2efb35e2 Sanity-check backup agent name prior to instantiation
Fixes a crash that would occur if an app with a pending backup
pass in the pipeline was updated to remove its agent declaration
from the manifest (or other more esoteric ways that a backup
pass was expected to run for an app without their own agent).

Bug 5776591

Change-Id: I5a8bc8c12de6a2bfa82f5093fe3a15b754109ab1
2012-03-23 13:00:05 -07:00
Craig Mautner
54c546223c Merge "Separate animation into separate class." 2012-03-22 17:15:17 -07:00
Craig Mautner
764983d169 Separate animation into separate class.
Introduction of the class WindowAnimator which takes care of all
animations stepping and Surface operations.

Change-Id: I78f1c269fa57df0616c08adbe156e3059709ae48
2012-03-22 16:46:01 -07:00
Mike Lockwood
8dde7e29fb Merge "Merge remote-tracking branch 'goog/ics-aah-exp' into merge" 2012-03-22 15:47:49 -07:00
Glenn Kasten
8b80a7ea8d Merge "AudioFlinger does not need libmedia any more" 2012-03-22 15:46:16 -07:00
Adam Powell
dd6dc5fcec Merge "Let users reach app details from ResolverActivity" 2012-03-22 15:33:11 -07:00
Mike Lockwood
fad55222db Merge remote-tracking branch 'goog/ics-aah-exp' into merge 2012-03-22 15:32:51 -07:00
Jeff Sharkey
6143f31537 Merge "NetworkPolicy multi-user tests." 2012-03-22 15:29:40 -07:00
Adam Powell
2d80962b2e Let users reach app details from ResolverActivity
A long press on a list item in ResolverActivity (shown when users are
asked to choose an activity to complete an action) will now open
the app detail settings for the package providing that item.

This is a work in progress; awaiting more UX input on other changes
and better discoverability of this feature.

Change-Id: I2cc07c5520fdd23cf1a43f169b114295f5d9d0ac
2012-03-22 15:29:37 -07:00
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
1c8e0a074b Merge "Fix Audio ramping code" 2012-03-22 15:14:29 -07:00
Mike Lockwood
ca1f596677 Merge changes Ifbc8b4dd,I96a4e3bf
* changes:
  Add config_wifi_driver_stop_delay to public.xml to fix build
  WifiStateMachine: Move wifi teardown delay to a framework resource
2012-03-22 15:14:05 -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
Mike Lockwood
1b6989cdc2 Merge commit '74803dc'
Change-Id: I35a76a27390c75a47e6387fb0ee853a5a689a56f
2012-03-22 15:09:52 -07:00
Travis Geiselbrecht
a91da5da56 add config_bluetooth_default_profiles config var and use it to disable bt profiles
For devices that don't care about the previously default bluetooth profiles,
add a config var to disable them.

Change-Id: I04bb7ad4b1235bc37227645f472fdf5b918f6a31
2012-03-22 15:09:44 -07:00
Kevin Hester
b85c933d85 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.

Change-Id: If38a1a10061a594dba5c220a86b32eec7b5ec901
2012-03-22 15:09:40 -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
Christopher Tate
e90585f89d Add a config resource to disable key-chord screenshotting
The key chord screenshot mechanism introduces significant latency into
processing of volume-key input; enough to be quite noticeable and
annoying on some kinds of device.  This patch introduces a new config
resource entry ("config_enableScreenshotChord"), true by default, so
that products on which this functionality is inapplicable can avoid
its runtime overhead.

Bug 6039047

Change-Id: I968ddf9046741da35988310b7893fae2c0369beb
2012-03-22 15:09:25 -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
Lei Zhang
6c798970cc Add batch volume adjust support to adjustMasterVolume() in AudioManager and
AudioService.

Change-Id: I09b1dfc93f14ca836e1ba2a400c00caed01fd541
2012-03-22 15:09:18 -07:00
RoboErik
24b082f87e Fix Audio ramping code
The audio ramping was being ignored and we were always adjusting
by the same amount.

Change-Id: Id4a6587fd488132816ae26776c0f798782470b1d
2012-03-22 15:09:12 -07:00
Mike Lockwood
c1c0ced669 Add config_wifi_driver_stop_delay to public.xml to fix build
Change-Id: Ifbc8b4dd97f20a343119b414423fdb609331e482
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-03-22 15:09:09 -07:00
Mike Lockwood
09a12bcfab WifiStateMachine: Move wifi teardown delay to a framework resource
Bug: 5931171

Change-Id: I96a4e3bf1d044ea4a4d2955775703b6f0ce862ed
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-03-22 15:09:05 -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 Brown
df78cd5ee9 Merge "Work around problems changing the database journal mode." 2012-03-22 15:07:48 -07:00
Jeff Brown
d67c8c6789 Work around problems changing the database journal mode.
Because we always disable WAL mode when a database is first opened
(even if we intend to re-enable it), we can encounter problems if
there is another open connection to the database somewhere.
This can happen for a variety of reasons such as an application opening
the same database in multiple processes at the same time or if there is a
crashing content provider service that the ActivityManager has
removed from its registry but whose process hasn't quite died yet
by the time it is restarted in a new process.

If we don't change the journal mode, nothing really bad happens.
In the worst case, an application that enables WAL might not actually
get it, although it can still use connection pooling.

Bug: 6124556
Change-Id: Ia2ffdbbc8f82721b170f3bf71bd5242dfd56d9ac
2012-03-22 14:53:01 -07:00
Andreas Huber
4355b001cb Merge "Use NuPlayer for media playback everywhere" 2012-03-22 14:00:53 -07:00
Wink Saville
3558486c13 Merge "Telephony: Move Cat to IccCard" 2012-03-22 13:54:09 -07:00
Christopher Tate
4b212786c5 am 96fecb7f: Merge "Make immersive mode public & imply update locking" into ics-aah
* commit '96fecb7f6b74176c0fad7bfa2c7ae9b80e1770cc':
  Make immersive mode public & imply update locking
2012-03-22 13:41:30 -07:00
Christopher Tate
96fecb7f6b Merge "Make immersive mode public & imply update locking" into ics-aah 2012-03-22 13:39:21 -07:00
Andreas Huber
8686938aa5 Use NuPlayer for media playback everywhere
if media.stagefright.use-nuplayer is set to true.

Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
2012-03-22 13:18:08 -07:00
Jeff Sharkey
dee7e2ac0c Merge "Fix test breakage." 2012-03-22 12:38:28 -07:00
Jeff Sharkey
4b63d69759 Fix test breakage.
Change-Id: I2c5fc8c3bf7795ccdd474caa3f858e9a56f026ed
2012-03-22 12:36:45 -07:00
Jack Palevich
f7f4c20605 Merge "Remove EGL context limit for Adreno GPUs." 2012-03-22 11:47:30 -07:00
Jack Palevich
2ffead9cf2 Merge "Ignore EGL_BAD_CURRENT_SURFACE errors from eglSwapBuffers" 2012-03-22 11:46:32 -07:00
John Grossman
b7536cf1ab am 6becc5a8: LibAAH_RTP: Fix an issue which crept in during code review.
* commit '6becc5a811c74a20e72eb8e81fdc5d21361d2d7f':
  LibAAH_RTP: Fix an issue which crept in during code review.
2012-03-22 11:34:42 -07:00
John Grossman
6becc5a811 LibAAH_RTP: Fix an issue which crept in during code review.
Fix a mistake which came in as part of a merge conflict resolution
during code review of the recent unicast mode refactor of LibAAH_RTP.
Nop packet which were supposed to carry TS transformations for the
pause state accidentally got flagged as Flush operations.  The flush
packet successfully carried the TS transformation, but also had the
undesired side effect of constantly flushing the stream.

Change-Id: I4c6aa0043fc274a1d7e880ed1d19cf277f22194b
Signed-off-by: John Grossman <johngro@google.com>
2012-03-22 11:30:09 -07:00
Jeff Sharkey
370f2dbc37 Merge "Move network policy to per-appId (instead of UID)." 2012-03-22 11:13:54 -07:00
Glenn Kasten
bf30911bf1 Merge "Remove enforceFrameCount" 2012-03-22 11:06:49 -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
Michael Kolb
b909b6a148 Merge "Monkey protection" 2012-03-22 10:56:32 -07:00
Michael Kolb
87a435a69d Monkey protection
Bug: 6191709

Change-Id: I0bc16f7970bda6b3f5ae3b5d59e3fbdee09a4956
2012-03-22 10:33:50 -07:00
Andrew Hsieh
b849e6c68d am 52058b4b: (-s ours) am 1c4c320d: am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '52058b4b55b0f918473d9887a80f4cd78ecc45e4':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:28:16 -07:00
Daniel Sandler
648e78f96f Merge "Notification actions API." 2012-03-22 10:24:00 -07:00
Andrew Hsieh
52058b4b55 am 1c4c320d: am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '1c4c320da7832129621e9e44d3f8d8902cb58462':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:22:24 -07:00
Marco Nelissen
66331b9c99 Merge "Support gapless playback for mp3 and m4a" 2012-03-22 10:18:59 -07:00