7546 Commits

Author SHA1 Message Date
Jeff Tinker
6a9687109c Merge "Add diagnostic error code to MediaDrm IllegalStateExceptions" 2014-06-20 20:43:34 +00:00
Jeff Tinker
d712e1a387 Add diagnostic error code to MediaDrm IllegalStateExceptions
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
2014-06-20 13:41:30 -07:00
RoboErik
ef3c9e9b05 Add volume handling APIs to sessions
This renames and moves the VolumeProvider and adds apis to
MediaController to get the current state of volume on a session and
to request changes to the volume.

Change-Id: I290e9efefb6676c805819a29e1d054c3192c6773
2014-06-20 13:39:41 -07:00
George Mount
53ad2a15d5 Merge "Make public basic transitions." 2014-06-20 02:09:17 +00:00
George Mount
7da1f58219 Make public basic transitions.
Bug 15727908

Adds slide, explode and fade transitions.

Change-Id: I8badb3a1e9230d66d9ca3d1edeec0510bc89d556
2014-06-20 07:07:18 -07:00
Andres Morales
626861c5a5 Merge "Framework changes to support NFC trustlet." 2014-06-20 02:15:46 +00:00
Andres Morales
3b33fd283c Framework changes to support NFC trustlet.
Adds a system-only ability to register for receiving
tags from NfcService at the lockscreen.

Change-Id: I4b50941031e8d1f40ebb6314211226e70a2ad187
2014-06-20 10:05:52 -07:00
Eric Laurent
2930764885 Merge "AudioManager: add startBluetoothScoVirtualCall()" 2014-06-20 02:09:17 +00:00
Eric Laurent
83900754f3 AudioManager: add startBluetoothScoVirtualCall()
Add API to start bluetooth SCO audio connection explicitly
in virtual call mode.

Bug: 11824396.
Change-Id: I1dfab13c659f5855e0b78467ac48b3186af7874c
2014-06-20 10:17:47 -07:00
Yorke Lee
cf9bc5e76d Revert "Add ability to set and get DefaultPhoneApplication"
This reverts commit 8bdb1ff3279ab9fde0499231580c76dc2533f3c4.

Change-Id: Idc6d64820c23a650e5f0113ed8ff0860c61ea6af
2014-06-20 10:05:17 -07:00
Dianne Hackborn
9226fc9bf5 Fix build.
Change-Id: I8b05b1dc4fdd0460c2dc92359b85d88b9f0f4f80
2014-06-19 18:32:08 -07:00
Craig Mautner
9d4e9bcebb Allow a root activity to relinquish task identity
If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.

The ability to set intent also includes the ability to set the
TaskDescription of the task.

Fixes bug 15675610.
Fixes bug 10428661.

Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
2014-06-19 16:40:01 -07:00
Paul Soulos
42cdda831d Adds usage stat columns to Entity
Change-Id: I273675ee85aba49440a494e4ae27e9104ffb2fe0
2014-06-19 16:13:38 -07:00
Andy McFadden
45b161d24d Merge "Make two Display methods public" 2014-06-18 22:47:18 +00:00
Andy McFadden
77db7d09ff Make two Display methods public
Un-hide getAppVsyncOffsetNanos() and getPresentationDeadlineNanos().

Bug 14612039

Change-Id: I76bee166b7bda3b96db36ffcb8d946d2b713ac09
2014-06-18 10:45:27 -07:00
Robin Lee
aab72f3b0a Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs""" 2014-06-17 21:55:55 +00:00
Robin Lee
306fe08ce2 Revert "Revert "Publish DevicePolicyManager CA certificate APIs""
This reverts commit 792b270dbdc980cfe04e8d461bf00a1f45b5e936.

Change-Id: I18c7e0eca39868230cd8e4f4bbeb3c44ff9e8b78
2014-06-19 14:04:24 +00:00
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs"
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
2014-06-17 22:12:28 +00:00
Kenny Guy
f7ecf7c805 Add badging a label to support accessibility.
To provide a way to differntiate the content description
of an icon that has been badged with a managed profile
badge.

Bug: 15106236
Change-Id: Icd5798bbd2410a105054877e3862e199eff24b88
2014-06-19 13:17:02 +01:00
Alan Viverette
29fa90490b Merge "Fix switch & slider anim, make View drawable hotspot API public" 2014-06-18 18:28:24 +00:00
Alan Viverette
8de1494557 Fix switch & slider anim, make View drawable hotspot API public
BUG: 15287810
Change-Id: Ic7a9549dc1ba8afd07e9a196371ed349a54aaf2f
2014-06-18 18:05:15 -07:00
Ruben Brunk
8bf102b1d2 Merge "camera2: Add shim frame duration and stall characteristics." 2014-06-17 21:43:29 +00:00
Ruben Brunk
3e4fed203f camera2: Add shim frame duration and stall characteristics.
Bug: 15116722
Change-Id: Ief8b05d46fa12f63cf6a5d41e312c94d5a033553
2014-06-19 14:50:45 -07:00
Christopher Tate
9c46e06478 Merge "Introduce <application> attribute android:fullBackupOnly={boolean}" 2014-06-17 21:43:29 +00:00
Christopher Tate
d1de2567c6 Introduce <application> attribute android:fullBackupOnly={boolean}
It is quite possible for an application to be happy with having the OS
save full-data archives of its data, but still need to selectively
filter the set of saved files or otherwise participate in full-data
backup and restore.  In general we assume that any app which provides
a backup agent implementation will be directly participating via the
incremental key/value backup API; this new attribute allows an app
to tell the OS "perform full-data backup/restore for me even though
I am supplying my own agent implementation to participate."

Change-Id: I810c50d44aa683b1f23604b7d1f3e96a1722103a
2014-06-17 18:02:48 -07:00
ztenghui
cf4832f69c Add path support into xml files for PathInterpolator and ObjectAnimator.
The test case is showing that AnimatedVectorDrawable is able to use path to
define time interpolator and object movement now.

Change-Id: If3c0418265d0fd762c8f5f0bb8c39cce3ad34ef3
2014-06-19 10:56:28 -07:00
Eric Laurent
ff0d9f098e AudioTrack: Add support for compressed audio
Add AudioFormat encoding definitions for compressed audio
and modify AudioTrack to accept compressed audio data.

Bug: 9428304.

Change-Id: Ib85a4d0d78af45924328f4d2d2ffebe83f4a00c5
2014-06-19 10:13:33 -07:00
Jae Seo
3bbd9be166 Merge "TvContract: Change constants of canonical genres to all-caps values" 2014-06-19 00:17:11 +00:00
Jae Seo
0e33c1286d Merge "TvContract: Add columns for video format and resolution" 2014-06-18 18:28:24 +00:00
Jae Seo
acc1957d78 TvContract: Change constants of canonical genres to all-caps values
This is just for consistency with other constant values.

Change-Id: If226af08e66532c9110bc88e3c68d3958c67cdb6
2014-06-17 19:44:10 -07:00
Jae Seo
68e0de81d5 TvContract: Add columns for video format and resolution
Added COLUMN_VIDEO_FORMAT to the Channels table to indicate typical
video format for programs from a given TV channel, which can later be
used to filter out channels. Also defined common video formats and
resolutions and a utility method to get the video resolution for a given
format.

Added COLUMN_VIDEO_WIDTH and COLUMN_VIDEO_HEIGHT to the Programs table
to indicate the actual video dimension for each individual TV program,
which can be shown as a part of program information by applications.

Bug: 15351111, 15456031
Change-Id: Id72e25de40f06a1b615620365e06cf11e4cd9f81
2014-06-17 19:41:43 -07:00
Jason Monk
c37bf2a87e Merge "Fix missed running update-api" 2014-06-17 21:13:21 +00:00
Jason Monk
72c16de7e3 Fix missed running update-api
The build server is stuck on something else, but will likely soon
discover this...

Change-Id: Ib029d07a09d373f8bea1204176f3d00c830c9f0b
2014-06-18 16:00:34 -04:00
Jason Monk
35c62a4668 Notify any profile/device owners of lock task
Add a method for DeviceAdminReceivers of profile/device owners to
be notified that lock task mode has entered or exited for an app
they have whitelisted.

Change-Id: Id124287d41564bbfccdacccf1977b7acb3ddec3f
2014-06-18 14:56:24 -04:00
Julia Reynolds
779d2cffbc Merge "Rename apps User Restriction." 2014-06-17 21:03:08 +00:00
Julia Reynolds
36fbc8d645 Rename apps User Restriction.
Change-Id: I9f81a6b94ba06b593e7213967df51c7cb30a7b31
2014-06-18 10:36:15 -04:00
Jason Monk
7ccf51dd79 Merge "Change clearDeviceOwnerApp to take a package" 2014-06-17 21:03:08 +00:00
Jason Monk
94d2cf9725 Change clearDeviceOwnerApp to take a package
If the caller is sharing uid, then the package from getPackage()
may not be the desired one.  This also matches better with the
other device owner calls.

Change-Id: I14f2ec4bff0717273f626072dabad0d2c76068a5
2014-06-18 09:53:34 -04:00
Kenny Guy
c6543afd6b Merge "Update API for launcher apps to use abstract class." 2014-06-17 22:01:53 +00:00
Jason Monk
fbe6be4f65 Merge "Notify any profile/device owners of lock task" 2014-06-17 21:07:42 +00:00
Jeff Sharkey
8fb63d5a5a Merge "Plumb split APKs into public API." 2014-06-17 20:55:27 +00:00
Jeff Sharkey
8a4c9721a9 Plumb split APKs into public API.
Introduces new ApplicationInfo fields to surface zero or more split
APKs for an application.  Splice these APKs into both the class
loader and resource system.  Cleaner building of these paths.

Run dexopt() on all split APKs found after a parse, and populate
into ApplicationInfo.

Change-Id: I4a376bf4492d84ea95aafa866e106ea43a43e492
2014-06-17 14:38:44 -07:00
Jim Miller
05d38d28b6 Merge "Hide IFingerprintService and IFingerprintServiceReceiver" 2014-06-17 20:55:27 +00:00
Jim Miller
06e658f324 Hide IFingerprintService and IFingerprintServiceReceiver
The @hide was being ignored because they were being used by the
constructor.  Fixed by making the FingerprintManager constructor
hidden.

Change-Id: I3cd409df5055579f5004b08d00d5d951b8e5afd3
2014-06-17 18:38:14 -07:00
Jim Miller
cd589baba9 Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts." 2014-06-17 21:07:42 +00:00
Jim Miller
a7596147b4 First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
2014-06-17 14:03:37 -07:00
Jason Monk
ebf55ad6de Merge "Change lock-task DPM authorization to packages" 2014-06-17 21:07:42 +00:00
Ihab Awad
87161a7667 Merge "Add methods to TelephonyManager for Subscription management (1/3)" 2014-06-17 20:49:29 +00:00
Ihab Awad
c35ad0252d Add methods to TelephonyManager for Subscription management (1/3)
As part of the effort to permit third-party suppliers of telephone
connectivity, we permit clients of TelephonyManager to obtain the
currently valid Subscription objects describing these suppliers. The
Subscriptions are intended to be self-describing such that an end-user
can choose from among them based on the information they contain. One
of these objects may then be attached to an ACTION_DIAL or ACTION_CALL
Intent to represent the end-user's choice of how to make a call.

Change-Id: I2ad1930079042d7bfe762b47c22f0538f7403bff

Conflicts:
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Conflicts:
	telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
2014-06-17 15:08:13 -07:00
fafaisland
5834ee7503 Merge "Add READ_ALL_VOICEMAIL permission in the core" 2014-06-17 21:46:58 +00:00