7524 Commits

Author SHA1 Message Date
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
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
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
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
Jason Monk
fbe6be4f65 Merge "Notify any profile/device owners of lock task" 2014-06-17 21:07:42 +00: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
Kenny Guy
c6543afd6b Merge "Update API for launcher apps to use abstract class." 2014-06-17 22:01:53 +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
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
fafaisland
88fb96505c Add READ_ALL_VOICEMAIL permission in the core
Bug:15695227

Change-Id: I96bebcd949293679d938b2ec290820d4ed9035fa
2014-06-17 15:51:58 -07:00
Robin Lee
6d3912e2ef Merge "Revert "Publish DevicePolicyManager CA certificate APIs"" 2014-06-17 21:55:55 +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
Craig Mautner
f62d690b00 Merge "Fix persistent tasks and expand scope" 2014-06-17 21:36:48 +00:00
Craig Mautner
43e52ed32e Fix persistent tasks and expand scope
- Fixed missing tag closure on the xml for storing Intent categories.
- Shortened timeout for flushing tasks to persistent storage from
one minute to ten seconds.
- Made persistency the default except for those tasks on the home
stack and those tasks that exclude themselves from the recent task
list.
- Fixed deletion of tasks after restoring. Tasks now survive a second
reboot, not just the first reboot.
- Fixed sort order so most recent tasks will be restored at front.

Fixes bug 15672002.

Change-Id: I16d87d58c6fd2e879cfd0c0b18b2694432a79b71
2014-06-17 17:22:58 -07:00
Jason Monk
ebf55ad6de Merge "Change lock-task DPM authorization to packages" 2014-06-17 21:07:42 +00:00
Chris Craik
96401d9995 Merge "Added primitive parameters to various functions requiring rectangles." 2014-06-17 20:42:58 +00:00
Alan Viverette
1f681448c6 Merge "Add attributes and accessors for tinting View drawables" 2014-06-17 20:42:58 +00:00
Alan Viverette
911743652b Add attributes and accessors for tinting View drawables
Also cleans up handling in setters for managed drawables.

BUG: 15391544
Change-Id: Idc08f7eaea0050feb6403566985a6d58185b81f8
2014-06-17 14:51:45 -07:00
Antonio Calabrese
2460958133 Added primitive parameters to various functions requiring rectangles.
Change-Id: I5a2678fa989f0ff34404b8236787a8153b05f113

bug:14322352
2014-06-17 20:17:59 +00:00
Jason Monk
d7b8621bde Change lock-task DPM authorization to packages
Switch the DPM lock-task authorization to be controlled by a package
rather than a component.

Change-Id: Ife9bed068f31ff2449b4451ab69d3586a3f09d89
2014-06-17 09:24:18 -04:00
Kenny Guy
c0154537b0 Update API for launcher apps to use abstract class.
Leaving old API behind until unbundled launcher
has been updated.

Bug: 15518265
Change-Id: Ic26878224df51093d7d08651adda08f760b405be
2014-06-17 12:22:39 +01:00
George Mount
d4c3c91dd0 Allow antroid.transition Transitions in fragments.
Bug 15274281
Bug 15189829

Change-Id: I8e2974430b84a611866fe20afe1f5745e803683f
2014-06-17 20:24:16 +00:00
Sai Cheemalapati
0f0bcb5ac5 Adds speakerphone extra to ACTION_DIAL (2/2).
If optional extra EXTRA_SPEAKERPHONE_ON is added
to an ACTION_DIAL intent, the speakerphone will turn
on automatically once the call is connected.

Bug: 6810980

Change-Id: Ie4e1c5b413e72f9b0dbd590384571147a43a11ac
2014-06-17 11:54:05 -07:00
Jae Seo
16a95459c6 Merge "TvContract: Enable building programs URI also with channel ID" 2014-06-17 05:00:50 +00:00
Alex Klyubin
fd445e0336 Merge "Add PSKKeyManager to enable the use of TLS-PSK." 2014-06-17 04:56:28 +00:00
Robin Lee
b12f1778d6 Merge "Publish DevicePolicyManager CA certificate APIs" 2014-06-17 05:12:50 +00:00
Richard Coles
2995606963 Merge "Connect WebView Async Cookie APIs" 2014-06-17 05:13:46 +00:00
Hector Dearman
24a11d311c Connect WebView Async Cookie APIs
Bug: 14379829
Change-Id: I6b0e0644153a805eccb48d30b0ad3e91babd8093
2014-06-17 15:32:07 +01:00
Jae Seo
cf9bec5bb6 TvContract: Enable building programs URI also with channel ID
Bug: 15446137
Change-Id: I322c1b90c272e553b028af1f9011feecde124915
2014-06-16 17:55:32 -07:00
Robin Lee
837304f6f6 Publish DevicePolicyManager CA certificate APIs
Exposes these methods:
 - hasCaCertInstalled
 - hasAnyCaCertsInstalled
 - installCaCert
 - uninstallCaCert

Allows device and profile owners to perform some certificate management
including querying for and enabling/disabling specific CA certificates.

Change-Id: I4aa8a1a8601b234e30acde99dfa382e04cb62495
2014-06-11 16:55:32 +01:00
Yorke Lee
3e960affb2 Merge "Add TelecommManager to system services" 2014-06-16 20:54:41 +00:00
Yorke Lee
b4ce1432c6 Add TelecommManager to system services
Change-Id: I48a75c578a99aca1149fbae84a5d0f9ac0a457f3
2014-06-16 14:41:50 -07:00
Elliott Hughes
bc6d140313 am 8f20914b: Merge "@hide." into lmp-preview-dev
* commit '8f20914b08607b85eabe5ea5701a3e144493b25b':
  @hide.
2014-06-16 20:58:04 +00:00