Andreas Gampe
0f94fc6f1d
Merge "Frameworks/base: Fix a constructor"
2015-04-25 20:16:12 +00:00
Aravind Akella
398e11837b
Merge "Add hidden SensorManager APIs for injecting sensor data."
2015-04-25 01:40:26 +00:00
Andy Hung
09f9a7adb3
Merge "Hide stretch mode from PlaybackSettings"
2015-04-25 01:28:47 +00:00
Etan Cohen
cd895cdf4d
Merge changes from topic 'mwd-merge-042415'
...
* changes:
Rename removeVideoCallListener to unregisterCallback
Bluetooth document fix: remove reference from open API to hidden entities
Fix build due to merge of 7595842 and renaming due to 8eb87f0
Merge commit '052a0da' into merge2
Merge commit 'db1dbb8' into merge2
Merge commit '7e5e791' into merge2
Merge commit '170102d' into merge2
Merge commit '4cb5d80' into merge2
Merge commit '83cda00' into merge2
Merge commit 'c91bc62' into merge2
Merge commit 'cffc360' into merge2
Merge commit '7f61051' into merge2
Merge commit '167c3a7' into merge2
Merge commit '4467b98' into merge2
Merge commit '25a217c' into merge2
Merge commit '04b18ec' into merge2
Merge commit '7595842' into merge2
Merge commit '2bbd2b6' into merge2
Merge commit '4890351' into merge2
Merge commit 'cd405fe' into merge2
Merge commit '6ddbb5e' into merge2
Merge commit 'de93575' into merge2
Merge commit '9561e74' into merge2
2015-04-25 00:51:47 +00:00
Andy Hung
18cb3b5a27
Hide stretch mode from PlaybackSettings
...
Different timestretch modes won't be ready for M.
Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8
2015-04-24 17:32:57 -07:00
Andy Hung
50c1ed73cd
Merge "Unhide new channel masks and deprecate old channel masks"
2015-04-24 23:43:35 +00:00
Jae Seo
344f9e5e9a
Merge "TIF: Add TvContentRating constant for unrated content"
2015-04-24 23:41:21 +00:00
Amith Yamasani
bf02d48f4a
Merge "More usage tracking"
2015-04-24 23:39:37 +00:00
Arunesh Mishra
b4d533ba53
Merge "Add AudioManager property strings for ultrasound."
2015-04-24 23:29:39 +00:00
Amith Yamasani
f47e51ec60
More usage tracking
...
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.
Bug: 20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
2015-04-24 16:12:01 -07:00
Yorke Lee
eca706ed9d
Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage"
2015-04-24 23:11:42 +00:00
Doris Liu
d34f44028d
Merge "Remove distance based animation duration API"
2015-04-24 23:05:01 +00:00
Jens Ole Lauridsen
0525677343
Merge "parcel: Add efficient methods for writing and reading a parcelable."
2015-04-24 22:37:46 +00:00
Etan Cohen
1418054108
Rename removeVideoCallListener to unregisterCallback
...
Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44
2015-04-24 15:22:03 -07:00
Lajos Molnar
e0112b51a1
MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed
...
Bug: 19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
2015-04-24 14:47:38 -07:00
Wei Jia
197b3daed7
Merge "MediaSync: add OnErrorListener."
2015-04-24 21:46:22 +00:00
Wei Jia
746306521a
MediaSync: add OnErrorListener.
...
Bug: 19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
2015-04-24 14:32:36 -07:00
Andy Hung
7fdf51b18a
Unhide new channel masks and deprecate old channel masks
...
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
2015-04-24 14:27:21 -07:00
Alex Klyubin
40485f5aac
resolved conflicts for merge of f9c14b7d to master
...
Change-Id: Ifa29891b8ad7979cbc28c54180b9606bb1319ff0
2015-04-24 14:21:41 -07:00
Etan Cohen
f9465fb6d2
Merge commit '7e5e791' into merge2
...
Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
2015-04-24 14:05:29 -07:00
Etan Cohen
644f41368f
Merge commit '4cb5d80' into merge2
2015-04-24 14:03:28 -07:00
Etan Cohen
4de834eb63
Merge commit 'c91bc62' into merge2
2015-04-24 14:02:45 -07:00
Etan Cohen
94f2c27aca
Merge commit '7f61051' into merge2
2015-04-24 14:02:07 -07:00
Etan Cohen
a179962b61
Merge commit '25a217c' into merge2
...
Change-Id: I116a9dbf19e95651a7c50393e4dcd7fb59ca3f3f
2015-04-24 13:58:45 -07:00
Etan Cohen
fa96c94c30
Merge commit '9561e74' into merge2
2015-04-24 13:43:36 -07:00
Amith Yamasani
4bc704655a
Merge "Add ability to get and set idle state of apps"
2015-04-24 20:03:02 +00:00
Arunesh Mishra
d08715e503
Add AudioManager property strings for ultrasound.
...
Change-Id: Ia1bc257affdb5afe2b6a00bcca53651f924be7d2
2015-04-24 13:01:08 -07:00
Amith Yamasani
cf76872a62
Add ability to get and set idle state of apps
...
Add am shell command to set and get idle
Add public API to check if an app is idle
Bug: 20534955
Bug: 20493806
Change-Id: Ib48b3fe847c71f05ef3905563f6e903cf060c498
2015-04-24 12:58:46 -07:00
Yorke Lee
1011f4870c
Add APIs to getDefaultDialerPackage and getSystemDialerPackage
...
getDefaultDialerPackage is a public API and will be used by
apps to determine if they are the default dialer.
getSystemDialerPackage is a hidden API and is only used by
system components.
Also add new public string constants to allow apps to show
a dialog requesting that the user change the current default
dialer.
Bug: 20304458
Change-Id: I121d36741474c1fe171c372fb766a6c128228c9c
2015-04-24 11:12:34 -07:00
Gustav Sennton
f2953dadbb
Merge "Add system API method for loading webview library from another package."
2015-04-24 09:27:19 +00:00
Jae Seo
7843e10e60
TIF: Add TvContentRating constant for unrated content
...
Bug: 19102311
Change-Id: I159a3d05197539b4badee6dccf21f15c388b186e
2015-04-23 23:36:07 -07:00
Lajos Molnar
61044cfd9c
Merge "media: deprecate correct codec color formats, add flexible formats"
2015-04-24 02:57:18 +00:00
Lajos Molnar
1af95701f7
Merge "media: add flexible YUV422, 444, and RGB/RGBA formats"
2015-04-24 02:56:47 +00:00
Lajos Molnar
931ae62f29
media: unhide and document already used fields
...
Bug: 18134807
Bug: 19300915
Bug: 11990564
Change-Id: Iaeab4a5359b946c4b1aeef6083d10045079b9720
2015-04-23 19:39:57 -07:00
Lajos Molnar
e7f12bfdf6
media: deprecate correct codec color formats, add flexible formats
...
Change-Id: Ie79c4027fa969fe352da224b3f1844b0a7eaaeaa
2015-04-24 02:34:48 +00:00
Andy Hung
b33d878de3
Merge "Add getFormat to AudioTrack and AudioRecord"
2015-04-24 02:26:29 +00:00
Lajos Molnar
d1d27c1543
media: add flexible YUV422, 444, and RGB/RGBA formats
...
These are used by Media.Image on getOutputImage.
Change-Id: I171c5b90423800eeab4e36625dcf727a2a2affcd
2015-04-23 19:14:32 -07:00
Doris Liu
7eaccbfbc2
Remove distance based animation duration API
...
Bug: 20500107
This reverts commit 0084e370955cfa1efbf8ab447ac5e71a5529f5d3.
Change-Id: I57f1f3a22c5adfefd966447050b100a50e7141b2
2015-04-23 18:33:39 -07:00
Jose Lima
786144599e
Merge "Add pre-order as a pricing type for ContentInfoExtender"
2015-04-24 01:23:34 +00:00
Andy Hung
463a8c7743
Add getFormat to AudioTrack and AudioRecord
...
This enables getting channel index masks and is future-friendly.
Change-Id: Ia0bb9a855e97e8279b2226cf75e0ddd03af3fb7f
2015-04-23 18:10:58 -07:00
Aravind Akella
18ebf732b8
Add hidden SensorManager APIs for injecting sensor data.
...
Change-Id: If49467ced1a719c49bb5ac7ab670e86ff4642eaa
2015-04-23 17:30:04 -07:00
Santos Cordon
1ff1d3203f
Merge "Remove CallState and rename PRE_DIAL_WAIT"
2015-04-24 00:06:55 +00:00
Yorke Lee
2973868885
Merge "Add TelecomManager.placeCall"
2015-04-23 23:49:24 +00:00
Yorke Lee
3e56ba14cc
Add TelecomManager.placeCall
...
Places a new outgoing call using the system telecom service
with the specified parameters.
Making emergency calls using this method requires that the
method-caller is either the user-selected default dialer app
or preloaded system dialer app.
Requires that the caller have the
{@link android.Manifest.permission#CALL_PHONE} permission.
Bug: 20348183
Change-Id: Ieedb5628e8c6be25137944e7c3639dc1d9bc61df
2015-04-23 16:48:52 -07:00
Jose Lima
4112056201
Add pre-order as a pricing type for ContentInfoExtender
...
Change-Id: Ibf9e4f57b47e92789d3e0730c58b0bce14663fec
2015-04-23 16:25:10 -07:00
Jonathan Basseri
48f8fe53ee
Merge "Adding carrier variables to control certain network settings."
2015-04-23 22:35:10 +00:00
Paul McLean
e56f57c375
Merge "(Re)routing Notification API in AudioTrack/AudioRecord."
2015-04-23 22:26:17 +00:00
Jonathan Basseri
ad5baab57e
Adding carrier variables to control certain network settings.
...
Bug: 20270007
Change-Id: I4075c159e4fceb2e8a5bdda1261f8b2470455595
2015-04-23 15:26:15 -07:00
Paul McLean
ec4097b0ca
Merge "Explicit routing in AudioRecord"
2015-04-23 22:25:19 +00:00
Paul McLean
2d6de4c38c
Explicit routing in AudioRecord
...
Change-Id: Ib3af1041d9f7bbccefd6b86cd3c35baf742be861
2015-04-23 16:11:34 -06:00