Jae Seo
b3dcbe5a4a
Merge "TIF: Update documentation on time shifting start/current position" into nyc-dev am: abaa339
...
am: ea46398
* commit 'ea46398b1a974a77d95e3aef36b2637aedc0fc7a':
TIF: Update documentation on time shifting start/current position
Change-Id: I13beef33fcf6f5f8a99a87867c8b031d80e30180
2016-04-14 20:12:16 +00:00
Jean-Michel Trivi
3c86a343df
Player superclass for handling AppOps features
...
Add a new class to group media/audio player features under one
interface. Currently only used for audio-related AppsOps
restrictions. In the future can group routing, audio focus
handling by the framework...
MediaPlayer inherits from PlayerBase, and overrides the methods
that are needed to delegate the handling of the restrictions
in a separate class.
When AppOps restrictions change (as triggered through the
callback in PlayerBase), reset the volume to its value intended
by the application (when unmuting) or the framework (0 when
enforcing the restriction).
Bug 28069414
Change-Id: I2f38e4b9b3c029778836868cf78f4d15d7603247
2016-04-14 12:49:20 -07:00
Jae Seo
ea46398b1a
Merge "TIF: Update documentation on time shifting start/current position" into nyc-dev
...
am: abaa339
* commit 'abaa3395e94754563fb4b07d077e5e87d41f6a17':
TIF: Update documentation on time shifting start/current position
Change-Id: I1bffba2462cdd443860249830b4b8cf9b32df6b8
2016-04-14 19:36:03 +00:00
Jae Seo
abaa3395e9
Merge "TIF: Update documentation on time shifting start/current position" into nyc-dev
2016-04-14 19:28:50 +00:00
TreeHugger Robot
822ced9504
Merge "TIF: More annotations" into nyc-dev am: a38b4ef
...
am: d3e9311
* commit 'd3e93119a0e52b0fe0046b47eee7c2f5613c8113':
TIF: More annotations
Change-Id: Ica3a63d8d4c687b3df02a97c10cfbe6f99c30c6a
2016-04-14 18:35:20 +00:00
Dongwon Kang
7c12cd3ae4
TIF: Add Programs.COLUMN_RECORDING_PROHIBITED
...
Bug: 28039913
Change-Id: I30897f164113ceb422c8c5a16448b8b296a5a68a
2016-04-14 11:05:07 -07:00
Jae Seo
4e3ded5561
TIF: Update documentation on time shifting start/current position
...
Now that we use the same set of API for both time shifting and
recording, the descriptions should be updated to support both use cases.
Bug: 28067038
Change-Id: I036446eca373ca27005f74b008a259f27b7c5f61
2016-04-13 17:32:52 -07:00
Jae Seo
d3e93119a0
Merge "TIF: More annotations" into nyc-dev
...
am: a38b4ef
* commit 'a38b4ef93917101d1100252d88fa6779e2cdd1f1':
TIF: More annotations
Change-Id: Ib5b844d7fe4ca9e5937af7195627c8cd632ac59f
2016-04-14 00:08:10 +00:00
Jae Seo
cdfbc488c6
TIF: More annotations
...
Bug: 20980990
Change-Id: I5bbdc19703aa15bffe2f2f900be63cbfe9f639ae
2016-04-13 15:36:03 -07:00
Dongwon Kang
5e3c6801f4
Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev am: 4c3dcc0
...
am: 4655cdd
* commit '4655cdd5c3ddf378eb134649e659e2dece973c83':
TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()
Change-Id: I6a413c97013430638ede5aa90099a54be0ecc770
2016-04-13 02:01:14 +00:00
Andy Hung
37d03d8d4b
Merge "Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp" into nyc-dev am: 03abaa5
...
am: ffc23a6
* commit 'ffc23a68f2a891720059ccc5326ee42bbaf8c3ca':
Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp
Change-Id: Ie5ea0b0495c679d43ae10cc6e8009cc1c8cabfa7
2016-04-13 02:01:00 +00:00
Dongwon Kang
4655cdd5c3
Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev
...
am: 4c3dcc0
* commit '4c3dcc0a16680b16b38ce09f1709724b42861abb':
TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()
Change-Id: I3b259c63f6035630a6673e9d6059402c2a635eb1
2016-04-13 00:42:43 +00:00
Andy Hung
ffc23a68f2
Merge "Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp" into nyc-dev
...
am: 03abaa5
* commit '03abaa5df97d914c968c2837712fa5e6f04cf189':
Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp
Change-Id: I3beec445a31e3fa9cdebabd4b34154858b2fe36e
2016-04-13 00:36:41 +00:00
Dongwon Kang
4c3dcc0a16
Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev
2016-04-13 00:36:35 +00:00
Andy Hung
03abaa5df9
Merge "Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp" into nyc-dev
2016-04-13 00:26:45 +00:00
Dongwon Kang
e9db0e1ed1
TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()
...
Bug: 28078300
Change-Id: I0546c80b50475b1f05d5c5229f6d3796c7372b60
2016-04-12 16:44:40 -07:00
Andy Hung
4c01520470
Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp
...
Bug: 27952053
Change-Id: I2940de5ef1a67ec9a2ad8e294149243679f7324a
2016-04-12 15:01:31 -07:00
Sungsoo Lim
84c462d322
Use a binder instead of a bundle in removeSubscriptionWithOptions
...
Bug: 27845319
Change-Id: I0264b39940481f6571187a42ec859ecf4967ae62
2016-04-12 16:28:33 +09:00
Marco Nelissen
be41c4bc4a
Merge "Add javadoc" into nyc-dev am: 5b6fd0f
...
am: e111298
* commit 'e1112980d39266862a6a21fa5c974ba68a993a0c':
Add javadoc
Change-Id: I7bc1075285b54b9662bff58b2b69f7d63cb03217
2016-04-12 02:47:20 +00:00
Marco Nelissen
e1112980d3
Merge "Add javadoc" into nyc-dev
...
am: 5b6fd0f
* commit '5b6fd0fc1a3bf4ff964159080a6a21a534a52212':
Add javadoc
Change-Id: I455d7402062c061debf16aeaa6c112053d67660f
2016-04-12 02:41:59 +00:00
Marco Nelissen
5b6fd0fc1a
Merge "Add javadoc" into nyc-dev
2016-04-12 02:33:43 +00:00
Marco Nelissen
59dcf6746b
Add javadoc
...
Bug: 27952005
Change-Id: Ia1b6b6a723c30979c7c7ad7c0b2c0e7e295f0831
2016-04-11 14:49:19 -07:00
Jeff Sharkey
dd1a2a3bb8
Merge "Clean up AudioRouting API internals." into nyc-dev am: 0e2e780
...
am: 98646e8
* commit '98646e8e5d0ca69ece528935c74546fcac81972b':
Clean up AudioRouting API internals.
Change-Id: Ic93a353100f85ca701ee182b179514649d0681f3
2016-04-11 20:51:22 +00:00
Jeff Sharkey
98646e8e5d
Merge "Clean up AudioRouting API internals." into nyc-dev
...
am: 0e2e780
* commit '0e2e7806b7092519a1f97364d5c7256251ad03d5':
Clean up AudioRouting API internals.
Change-Id: I2c1758d8843fc603623cf1ac4c698823ec589111
2016-04-11 20:46:14 +00:00
Hangyu Kuang
402a01ea74
Merge "media: update VP9 CodecProfileLevel" into nyc-dev am: 333c7d3
...
am: a20e438
* commit 'a20e438c8f987cb1610f8e0a1ae31ba3cd0affcd':
media: update VP9 CodecProfileLevel
Change-Id: I1d5fe2735b9da4eb1c490209db5131ca43d1a95d
2016-04-11 20:40:37 +00:00
Hangyu Kuang
a20e438c8f
Merge "media: update VP9 CodecProfileLevel" into nyc-dev
...
am: 333c7d3
* commit '333c7d36008c43a45be9bde672b45218cb6dc707':
media: update VP9 CodecProfileLevel
Change-Id: Icd4caa3922838bd1a5891af28a90413eeed87f52
2016-04-11 20:35:14 +00:00
Jeff Sharkey
0e2e7806b7
Merge "Clean up AudioRouting API internals." into nyc-dev
2016-04-11 20:33:50 +00:00
Hangyu Kuang
333c7d3600
Merge "media: update VP9 CodecProfileLevel" into nyc-dev
2016-04-11 20:22:18 +00:00
Shubang Lu
e72ec3e2cc
Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev am: e346335
...
am: 009f5cd
* commit '009f5cd5914897055beefd982d927dc2030c70ef':
TIF: Add equals() and hashCode() for comparisons
Change-Id: Ie53bfacfcb481171d6ceed8f50134cef6d1481a5
2016-04-11 19:49:25 +00:00
shubang
009f5cd591
Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev
...
am: e346335
* commit 'e346335d3c00b1e42bf90a07133d1893e0d269d0':
TIF: Add equals() and hashCode() for comparisons
Change-Id: I633bd032d4aa69370aa99106b87da6099472316b
2016-04-11 19:44:28 +00:00
Shubang Lu
e346335d3c
Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev
2016-04-11 19:37:25 +00:00
Hangyu Kuang
f0ef572fd0
media: update VP9 CodecProfileLevel
...
Bug:27969307
Change-Id: I44f230bb691bd193c2119b399eca17da87bfbc97
2016-04-11 12:08:03 -07:00
Jeff Sharkey
ed2edc7a8e
Clean up AudioRouting API internals.
...
Reuse existing OnRoutingChangedListener APIs and internal logic by
extending the new AudioRouting.OnRoutingChangedListener. We use
new default methods to delegate incoming calls on the legacy
interfaces.
Fix a handful of locking bugs.
Bug: 27950070, 27952052, 27949198
Change-Id: Ie584108bcbeeab064d8e27d4984e541f31d36728
2016-04-11 13:01:55 -06:00
shubang
c2215d0856
TIF: Add equals() and hashCode() for comparisons
...
Bug: 21307285
Change-Id: I6afcde913b3238044fd66d5f74afe3f97a85b25e
2016-04-11 10:53:36 -07:00
Jaesung Chung
d1b04ba98f
Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev am: 6d01f0a
...
am: f8c9926
* commit 'f8c992629bc97dd0890482249662e038341fd2b9':
ExifInterface: inform the developers to close their FD/streams
Change-Id: I98786e6c27a9ce2a8e3433b8a6c1f9d0e57a757a
2016-04-09 06:26:00 +00:00
Jaesung Chung
f8c992629b
Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev
...
am: 6d01f0a
* commit '6d01f0af4301341975e66475758e4e5c49f95d40':
ExifInterface: inform the developers to close their FD/streams
Change-Id: Ia3eeaef1b5f01ee1a0a2936b24c77c890f22dfb9
2016-04-09 06:12:06 +00:00
Jaesung Chung
6d01f0af43
Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev
2016-04-09 06:04:37 +00:00
Lajos Molnar
7a5a93b776
media: document MediaFormat.KEY_FRAME_RATE better
...
Bug: 27126548
Change-Id: I7e6a70bd192623d335816c1aa135448b7846aa92
2016-04-08 23:44:05 +00:00
Jaesung Chung
c048c5f74a
ExifInterface: inform the developers to close their FD/streams
...
After use of constructors for FD/Streams, developers should close their
FD/streams.
Bug: 27948392
Change-Id: I6c26213d6804791e6d72d5830566f63e5ed57284
2016-04-08 22:34:47 +09:00
Daichi Hirono
8dc7f92c00
Merge "Close MTP database when MtpServer\'s thread is terminated." into nyc-dev
...
am: 4e5bbc3
* commit '4e5bbc3ea70a959ab4ab79332f0328b36e6442d6':
Close MTP database when MtpServer's thread is terminated.
Change-Id: Ie19841ea8fa406a7cc17066d5766fae9dfd53452
2016-04-08 00:22:52 +00:00
Daichi Hirono
4e5bbc3ea7
Merge "Close MTP database when MtpServer's thread is terminated." into nyc-dev
2016-04-08 00:13:02 +00:00
Dongwon Kang
c324bf2514
Merge "TIF: Fix a typo in the documentation" into nyc-dev am: f07ec15
...
am: 025a9217
* commit '025a921799044d48b179f45613d7e25241b6432b':
TIF: Fix a typo in the documentation
Change-Id: Ic0e82ede4820a3e5736cbdc2b330ce58f3e2c812
2016-04-07 23:05:13 +00:00
Dongwon Kang
025a921799
Merge "TIF: Fix a typo in the documentation" into nyc-dev
...
am: f07ec15
* commit 'f07ec150f3174af4a125b99f6cf053fb22903bfc':
TIF: Fix a typo in the documentation
Change-Id: I4f3686679a885e1ab26d3a13a58386b333b94d96
2016-04-07 23:01:22 +00:00
Dongwon Kang
f07ec150f3
Merge "TIF: Fix a typo in the documentation" into nyc-dev
2016-04-07 22:56:47 +00:00
Dongwon Kang
308fe5741f
TIF: Fix a typo in the documentation
...
Change-Id: I0e4963ca6ce3f42682a7d591f913ea801987b31b
2016-04-07 13:39:35 -07:00
Daichi Hirono
fe259319e6
Close MTP database when MtpServer's thread is terminated.
...
Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
(cherry picked from commit dd383597c4 )
2016-04-07 05:47:41 +00:00
Robert Shih
dc05dab86f
Merge "DrmInitData: prevent public constructor access" into nyc-dev am: 696dc4d
...
am: dd9c91d
* commit 'dd9c91d2bafb255f6ec91e257166c6bfbcc4651a':
DrmInitData: prevent public constructor access
Change-Id: I9753ed732d1c522b5753946c51f38178b650bd0a
2016-04-06 17:23:27 +00:00
Robert Shih
dd9c91d2ba
Merge "DrmInitData: prevent public constructor access" into nyc-dev
...
am: 696dc4d
* commit '696dc4d8df457d9321038f4b7c6f2c8f44f1ee0f':
DrmInitData: prevent public constructor access
Change-Id: I518a109df2c4f071c5804163bf518208e6425e8b
2016-04-06 17:17:47 +00:00
Robert Shih
696dc4d8df
Merge "DrmInitData: prevent public constructor access" into nyc-dev
2016-04-06 17:13:23 +00:00
Daichi Hirono
d9babdad23
Merge "Close MTP database when MtpServer's thread is terminated."
2016-04-06 04:46:27 +00:00