8494 Commits

Author SHA1 Message Date
Jae Seo
47b9e4afc9 TIF: Add the video frame rate information to TvTrackInfo
Bug: 16187997
Change-Id: I25d5489e42502fa8f2537aadc205bb4203980fb2
2014-08-19 12:02:16 -07:00
Shishir Agrawal
a34bdb18c5 Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev 2014-08-19 02:43:23 +00:00
RoboErik
47a7d247ef Merge "Api updates to MediaSession components" into lmp-dev 2014-08-19 02:43:23 +00:00
RoboErik
d2b8c947dd Api updates to MediaSession components
-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo

bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
2014-08-20 10:05:06 -07:00
vandwalle
da3475dba7 Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev 2014-08-20 16:06:26 +00:00
vandwalle
1575d90605 remove passpoint, except ANQP - DO NOT MERGE
This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149

Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45
2014-08-19 01:54:41 +00:00
Chris Craik
e2527bc206 Merge "Add outlineProvider attribute" into lmp-dev 2014-08-19 22:53:25 +00:00
Chris Craik
f56885d413 Add outlineProvider attribute
bug:16871683
Change-Id: Iae9326c41872ac03d40ebeec6257522a34cbe1ff
2014-08-19 18:04:14 -07:00
Amith Yamasani
609aaca4d8 Merge "Rename restrictions API class and method" into lmp-dev 2014-08-19 22:53:25 +00:00
Amith Yamasani
d1d7c022c6 Rename restrictions API class and method
AbstractRestrictionsProvider -> android.service.restrictions.RestrictionsReceiver
requestPermission->onRequestPermission

Bug: 17006805
Change-Id: I03b1626d6abcd2ad739a55b60b54fdbf9810ceca
2014-08-19 17:03:41 -07:00
destradaa
2d86b70cf3 Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 2014-08-16 04:03:42 +00:00
destradaa
c4e1e59561 Add @SystemApi annotation to Geofence Hardware types.
b/17008446

Change-Id: Id3f92dd03309324d3343c87da8c3e30733d06a64
2014-08-18 10:22:23 -07:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
2014-08-17 17:59:22 -07:00
Jae Seo
c22d0c0941 TIF: Make passthrough related method names consistent
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
2014-08-16 04:52:56 +00:00
Kenny Guy
545de86fca Merge "First part of renaming methods in LauncherApps." into lmp-dev 2014-08-16 04:29:45 +00:00
Jeff Sharkey
742e790294 Progress towards staging ASECs.
Move location selection logic into shared PackageHelper location,
and share it between DCS and PackageInstaller.  Fix bugs related to
installed footprint calculation; always count unpacked native libs.

Have PMS do its own threshold checking, since it's fine to stat
devices.  PMS only ever deleted staging ASECs, so move that logic
into installer and nuke unclaimed staging ASECs.  Allocate legacy
ASEC names using PackageInstaller to make sure they don't conflict
with sessions.

Start wiring up session to allocate ASEC and pass through staged
container for installation.

Fix bug to actually delete invalid cluster-style installs.

Bug: 16514385
Change-Id: I325e0c4422fc128398c921ba45fd73ecf05fc2a9
2014-08-18 15:52:24 -07:00
Nicolas Prévot
2e365c805a Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 2014-08-16 04:29:45 +00:00
Nicolas Prévot
6d24849387 Revert "Adding the requiredForProfile flag."
This reverts commit 531270a4a177a9f245d328d9467c6d1adbd5354a.

BUG: 17102702

Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c
2014-08-18 12:51:11 +01:00
Sailesh Nepal
7257bd8b51 Merge "Make AudioState constructors public" into lmp-dev 2014-08-16 04:01:11 +00:00
Santos Cordon
823fd3c79d Update conference call APIs.
Clean up conference call APIs to use a distinct type separate from
Connection.  Also allow the addition of Conference calls at any point
using addConference() API method.

Bug:16844332
Bug:16449372
Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
2014-08-18 17:30:58 +00:00
Sailesh Nepal
1d04c0f394 Make AudioState constructors public
This is needed for unit tests.

Bug: 17073934
Change-Id: I04659faa54ba03247519237450b0a26f66958e8c
2014-08-17 18:39:13 -07:00
Alan Viverette
0a992a8288 Merge "Add spinner style for use in forms" into lmp-dev 2014-08-15 18:56:10 +00:00
Adam Lesinski
91306bccf1 Merge "Add FeatureGroup to PackageInfo" into lmp-dev 2014-08-15 18:56:10 +00:00
Adam Lesinski
d3edfde51b Add FeatureGroup to PackageInfo
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.

Bug:16822121

Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
2014-08-15 15:53:35 -07:00
Jeff Sharkey
3e3b251f46 Merge "PackageInstaller API refactoring." into lmp-dev 2014-08-15 18:56:10 +00:00
Jeff Sharkey
a0907436c0 PackageInstaller API refactoring.
Switch to using IntentSender for results to give installers easier
lifecycle management.  Move param and info objects to inner classes.

Bug: 17008440
Change-Id: I944cfc580325ccc07acf22e0c681a5542d6abc43
2014-08-15 15:57:02 -07:00
Julia Reynolds
d438deffad Merge "Apply lockdowns when user restrictions are set." into lmp-dev 2014-08-15 19:03:20 +00:00
Julia Reynolds
3d9eb78fe9 Apply lockdowns when user restrictions are set.
Previously DMAgent would apply these lockdowns before/
after setting the matching user restrictions.

Bug: 16701642
Bug: 16945830
Bug: 16944983
Change-Id: Ib4f7145055687f12408d6ccacd8e6380406a32b2
2014-08-15 16:16:38 -04:00
Kenny Guy
f939dbaf76 First part of renaming methods in LauncherApps.
Added new versions of the APIs that need
renaming.

Bug: 17008230
Change-Id: Ic74d21115dd250082f6dbc45d1301635cc176cfc
2014-08-15 16:35:28 +01:00
Chet Haase
a4888fbac9 Merge "Minor doc fixes from API council recommendations." into lmp-dev 2014-08-15 08:11:59 +00:00
Chet Haase
6beeb75723 Minor doc fixes from API council recommendations.
Issue #17008236 API review: android.graphics

Change-Id: I171d376b642707858198d8a1379c732fcfcab4dd
2014-08-15 11:14:48 -07:00
Alan Viverette
36721fd11d Add spinner style for use in forms
BUG: 16736289
Change-Id: Ia514e81970fe1331130e3678b9bba4b42dfe4e35
2014-08-14 17:22:43 -07:00
Shishir Agrawal
64820af4e5 Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
Seems to have gotten overlooked in the last change.

Bug: 17031384
Change-Id: If7f92c128ddddd606510d7acf88168aebc061e80
2014-08-14 12:24:48 -07:00
Jason Monk
48aacba761 Fixes to lock task API from API review
Adding ComponentNames and some splitting/renaming of broadcasts.

Bug: 17005622
Change-Id: I9ece3553310fb20b0c3c3e4032b408e86384363a
2014-08-14 11:37:58 -04:00
Jim Miller
66093a9024 API review - move confirm credential constants from Intent
Moves constants from Intent to KeyguardManager.

Fixes bug 17006280

Change-Id: I77f49fe85850a501e1531d39aad7446c9bca5801
2014-08-15 00:38:21 +00:00
Jim Miller
4d64746d6a Revert "Add new intent to prompt user for their device credential."
Move API to KeyguardManager.

Fixes bug 17006280

This reverts commit 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26.

Change-Id: I7b58bb4d9db828028c1021f17b01745c5ec2161e

Conflicts:
	core/java/android/content/Intent.java
2014-08-15 00:35:50 +00:00
Jae Seo
fc27d6db08 TIF: Rename R.attr.contentRatingSystemXml and fix documentation
- Rename contentRatingSystemXml to tvContentRatingDescription.
- Change docs to indicate this is a reference to an XML document that
  describes TV content rating, not a component name.
- Replace the DTD with an XML example.

Bug: 16960702
Change-Id: Iea985e9847ee5af0f745e896c498792234308b12
2014-08-14 17:28:07 +00:00
RoboErik
b05ea7bb28 Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 2014-08-14 16:10:21 +00:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
2014-08-13 15:00:21 -07:00
Doug Zongker
f0433e50c7 Merge "@hide RECOVERY permission" into lmp-dev 2014-08-12 23:14:35 +00:00
Jose Lima
235510e672 Made AlarmClockInfo a nested class in AlarmManager
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da Renamed "media playing" APIs to "visible behind"
- Request from API Review: rename the media playing APIs to a more
     generic name, reflecting the background visibility feature these
     methods actually control.
   - Made the new isActivityVisibleBehind().
   - Changed convertFromTranslucent() and convertToTranslucent() to be
     SystemApi.

Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
2014-08-14 02:00:04 +00:00
ztenghui
eceec05d4c Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
This reverts commit d0a9544a772c906ed68793209d1e4a809174cca2.
2014-08-13 17:25:15 +00:00
Jean-Michel Trivi
ceb4d41846 Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 2014-08-12 23:14:35 +00:00
keunyoung
c093bf2645 rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
bug: 16959030
Change-Id: I413a2ba676488bfc18e393465b98681682ec88d4
2014-08-13 18:58:03 +00:00
Dianne Hackborn
deb434ca08 Merge "Add 560dpi, and some other stuff." into lmp-dev 2014-08-12 23:14:35 +00:00
Ihab Awad
b19a0bcdd8 Final structural tweaks to Telecomm API (1/8)
Bug: 16416927
Bug: 16494880
Change-Id: I45fbe287c410cbb5e1b985f320b862d732811f43
2014-08-13 11:16:46 -07:00
Alan Viverette
f2546bf423 Merge "Add API for obtaining max text length for accessibility" into lmp-dev 2014-08-12 23:14:35 +00:00
Alan Viverette
e07b595519 Deprecate InputMethodService.enableHardwareAcceleration()
BUG: 16951553
Change-Id: I126ea823eb2eeabb29d30999dec9c9411b33b315
2014-08-14 20:06:02 +00:00