Commit Graph

5648 Commits

Author SHA1 Message Date
Dongwon Kang
3f6a81ba6a TIF: Add null-checking in Programs.Genres.encode/decode
Bug: 27292029
Change-Id: I041a5242f9e5fef9c5c7f89e3d5d597a6063ed4c
2016-02-24 13:01:44 -08:00
Arunesh Mishra
f47f173b06 Fix AlwaysOnHotwordDetector recognition event bug.
Parcelables don't work well with inheritance. So changed the
IRecognitionStatusCallback to have onKeyphraseDetected() and
onGenericSoundTriggerDetected() for those respective events.

Made corresponding changes to AlwaysOnHotwordDetector and SoundTriggerDetector.

Bug: 27250528
Change-Id: Ic08a431e7cc4248c688b05c865348170246de576
2016-02-24 12:57:01 -08:00
Jae Seo
75536db65a Merge "Enable to set canRecord and tunerCount statically" into nyc-dev am: ae262a8928
am: 05e63a254d

* commit '05e63a254d126d9620a42354a96428d9458e33d3':
  Enable to set canRecord and tunerCount statically
2016-02-24 18:08:21 +00:00
Jae Seo
ae262a8928 Merge "Enable to set canRecord and tunerCount statically" into nyc-dev 2016-02-24 17:53:48 +00:00
Jean-Michel Trivi
3878da9338 Merge "Audio record notification: report client/device configuration" into nyc-dev am: 16ad43c000
am: 7fcbcdb134

* commit '7fcbcdb134b4c3010e2c42c23745fa281552a629':
  Audio record notification: report client/device configuration
2016-02-24 17:19:06 +00:00
Jean-Michel Trivi
16ad43c000 Merge "Audio record notification: report client/device configuration" into nyc-dev 2016-02-24 17:08:34 +00:00
Jeff Sharkey
a40e290347 Merge "Don\'t try caching null ringtones." into nyc-dev am: 6bda33f6a0
am: c60f575669

* commit 'c60f5756691e8f47af4eb0fe70d1adf98b489676':
  Don't try caching null ringtones.
2016-02-24 17:04:08 +00:00
Jeff Sharkey
6bda33f6a0 Merge "Don't try caching null ringtones." into nyc-dev 2016-02-24 16:55:37 +00:00
Jeff Sharkey
97f061bb7c Don't try caching null ringtones.
Bug: 27330629
Change-Id: Id09d10d6f4a3a20782480647c68a5c94ef69e7b3
2016-02-24 09:54:16 -07:00
Donghyun Cho
1ea5683217 MediaSession: Add a way to get a calling package
Introduced a new method, MediaSession#getCallingPackage(), which returns
the name of the package that sent the last media button, transport
control, or command from controllers and the system.

Bug: 25208121
Change-Id: I90bc1fe3e5e432f6c95b4adfbef6ea6cea9244ff
2016-02-24 20:30:47 +09:00
Donghyun Cho
f9f240ab7d MediaSession: Update javadoc of prepare-related methods
Bug:25841735, Bug:25153060, Bug:25153353
Change-Id: I95cd2b7381e3d8abe5a5c79dbd8655a02f8d40c3
2016-02-24 16:19:47 +09:00
Dongwon Kang
12aefc4104 Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev am: b4caa028c2
am: 632dfe783b

* commit '632dfe783b97b18d4d012f331bc423ee360de840':
  TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER
2016-02-24 02:26:56 +00:00
Dongwon Kang
b4caa028c2 Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev 2016-02-24 02:09:03 +00:00
Dongwon Kang
a60bc111e5 TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER
Bug: 21778419
Change-Id: I1684e2f1c274306706736061e3f41c9840e563c4
2016-02-23 18:03:55 -08:00
Zhijun He
8e694e3b49 ImageReader: skip callback when image reader is being closed
The application could acquire images in onImageAvailable callback when
the ImageReader is being closed. We need some protection here to avoid
application crash.

Change-Id: Ie5be8450048c0cfd78e5a7e27befe4de425d79f3
2016-02-23 17:54:30 -08:00
Jae Seo
dee3cfe897 Enable to set canRecord and tunerCount statically
Bug: 27276122
Change-Id: I61d07cfdbe13e4484ccaf5cdcf0796f08c78e2a8
2016-02-23 16:52:16 -08:00
Jean-Michel Trivi
33fd8169cd Audio record notification: report client/device configuration
Report client and device recording configuration during updates.
Support querying the AudioFormat in AudioRecordConfiguration.

Bug 22876530

Change-Id: I90b44db9bc3fda479452fc63221f8082f5b6a741
2016-02-23 16:40:03 -08:00
Jae Seo
756984be18 Merge "TIF: Unhide URI util methods" into nyc-dev am: eefb17ac61
am: 1300e14d79

* commit '1300e14d79d1a1fcc33426cb2e4629116c40f693':
  TIF: Unhide URI util methods
2016-02-23 23:56:22 +00:00
Jae Seo
eefb17ac61 Merge "TIF: Unhide URI util methods" into nyc-dev 2016-02-23 23:39:10 +00:00
Jae Seo
87079f1fd8 TIF: Unhide URI util methods
Bug: 27314735
Change-Id: Ib2aeb451a435bb959efb1cba359c335b051f88e5
2016-02-23 15:22:33 -08:00
Jeff Sharkey
f90abdebdb Merge "Offer to cache ringtones in system DE storage." into nyc-dev am: 1ce5c28ba5
am: 2b2974dcef

* commit '2b2974dcef503da3b02c7bd67becad709ead7951':
  Offer to cache ringtones in system DE storage.
2016-02-23 21:23:54 +00:00
Dongwon Kang
cea4d0b746 Merge "TIF: Add @NonNull for Programs.Genres.encode/decode" into nyc-dev am: 62b6a00b64
am: 9933ef271b

* commit '9933ef271b1edc5545c6bc3c04c8f9f08fafd522':
  TIF: Add @NonNull for Programs.Genres.encode/decode
2016-02-23 21:13:16 +00:00
Jeff Sharkey
1ce5c28ba5 Merge "Offer to cache ringtones in system DE storage." into nyc-dev 2016-02-23 20:57:46 +00:00
Dongwon Kang
df1e10ddac TIF: Add @NonNull for Programs.Genres.encode/decode
Bug: 27292029
Change-Id: Ib74f6383f3b0880179b51268e730ea8e88ab20c3
2016-02-23 12:43:58 -08:00
Jeff Sharkey
413573ac59 Offer to cache ringtones in system DE storage.
Ringtones often live on shared media, which is now encrypted with CE
keys and not available until after the user is unlocked.  To improve
the user experience while locked, cache the default ringtone,
notification sound, and alarm sound in a DE storage area.

Bug: 26730753
Change-Id: Ie6ad7790af4c87dd25759df3ed017e3b91a2fb87
2016-02-23 13:27:00 -07:00
Jae Seo
9378b70f3a Merge "TIF: Hide android.permission.READ_TV_LISTINGS" into nyc-dev am: 47d1f420bb
am: 873aa0bd13

* commit '873aa0bd139e40bb3e01366f4b42189d8c546472':
  TIF: Hide android.permission.READ_TV_LISTINGS
2016-02-23 18:58:14 +00:00
Jae Seo
47d1f420bb Merge "TIF: Hide android.permission.READ_TV_LISTINGS" into nyc-dev 2016-02-23 18:37:41 +00:00
Jean-Michel Trivi
b9afa687f0 Merge "New constant for BUS audio devices" into nyc-dev am: 7e2127a970
am: 49271e3c5e

* commit '49271e3c5ef9908f6d6e8aa483fd26a5e2f0c2e4':
  New constant for BUS audio devices
2016-02-23 18:10:17 +00:00
Jean-Michel Trivi
7e2127a970 Merge "New constant for BUS audio devices" into nyc-dev 2016-02-23 17:55:29 +00:00
Jean-Michel Trivi
e0248fe47d Merge "Make android.media.AudioFormat parcelable" into nyc-dev am: a572e4a87b
am: fa7c0274bf

* commit 'fa7c0274bfd52c7e9b01439152dbd6bfa736573e':
  Make android.media.AudioFormat parcelable
2016-02-23 17:02:40 +00:00
Jean-Michel Trivi
a572e4a87b Merge "Make android.media.AudioFormat parcelable" into nyc-dev 2016-02-23 16:54:12 +00:00
Jae Seo
b1f7fab4e4 TIF: Hide android.permission.READ_TV_LISTINGS
Bug: 21959866
Change-Id: Ie0e36749b8fe86faebadfaab4ebe5847fac3c343
2016-02-22 21:35:32 -08:00
Jean-Michel Trivi
5affc2b587 Make android.media.AudioFormat parcelable
Bug 22876530

Change-Id: If027715aad32ce8796a7e223ba51c301a3dd1192
2016-02-22 17:29:32 -08:00
Jae Seo
c412e925c4 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev am: af326ed2b9
am: 43ddc14d5d

* commit '43ddc14d5da7e9432d4847fe3485a5cd42b783cc':
  TIF: Add android.permission.READ_TV_LISTINGS
2016-02-23 00:14:11 +00:00
Jae Seo
af326ed2b9 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev 2016-02-22 23:44:48 +00:00
Hangyu Kuang
82a45249f6 Update Android mediamuxer documentation.
Several apis miss documentation of exceptions.

Bug: 27075269
Change-Id: I40c3ecf238b694c43612a2d7a6c30f84b3062ba2
2016-02-22 10:59:13 -08:00
Donghyun Cho
53df72c2d2 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev am: f3db5743b9
am: e53db46568

* commit 'e53db46568f2a7830e5fe1d8ddd69d8c0dfb89b7':
  MediaSession: Add new methods for preparing media content
2016-02-22 03:46:43 +00:00
Donghyun Cho
f3db5743b9 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev 2016-02-22 03:38:55 +00:00
Jae Seo
ed76f3509d TIF: Add android.permission.READ_TV_LISTINGS
Bug: 21959866
Change-Id: I6f30289f8660ed8d268bb9138c32d9c6a95bb0b9
2016-02-20 02:17:39 -08:00
Jiabin Huang
8983bd4309 Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev am: 079cf52336
am: 63f2971dee

* commit '63f2971dee821db92d3fbb88d28ada58897cc89f':
  TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
2016-02-20 08:46:05 +00:00
Jiabin Huang
079cf52336 Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev 2016-02-20 07:01:29 +00:00
Jiabin
0388f0e503 TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
test result:
 Decode function takes about 0.25 seconds with 1350 channels in Live Channels.
 The original one takes about 0.37 seconds in the same test case.

Bug: 23307587
Change-Id: I3a1fefe0b3e6c1986c8f515259658f2e3e23011f
2016-02-20 14:22:33 +09:00
Lajos Molnar
a8be884d0b Merge "media: expose audio sample format in MediaFormat" into nyc-dev am: 0ab076c5c9
am: 4474a5cd4b

* commit '4474a5cd4b6b55e14048515be5a04ba438f60e90':
  media: expose audio sample format in MediaFormat
2016-02-19 18:56:54 +00:00
Lajos Molnar
0ab076c5c9 Merge "media: expose audio sample format in MediaFormat" into nyc-dev 2016-02-19 18:47:06 +00:00
Dongwon Kang
6aeca36685 Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev am: ca601d9303
am: d98c06cad3

* commit 'd98c06cad34c57eb783d7d61a73d797b7be5deee':
  TIF: Unhide TvContract.Programs.Genres#isCanonical
2016-02-19 00:08:09 +00:00
Dongwon Kang
d16d1f519b TIF: Unhide TvContract.Programs.Genres#isCanonical
Bug: 25726917
Change-Id: I8717b1c9f39f8b5b9196658c1501d5abf2337eb9
2016-02-18 15:42:09 -08:00
Jean-Michel Trivi
93687f2718 New constant for BUS audio devices
Add a new constant covering "bus"-type audio devices.

Bug 25448664

Change-Id: I8c3e439f28756a940f528ade2f6ce3a72a546040
2016-02-18 10:16:07 -08:00
Donghyun Cho
22188f1187 MediaSession: Add new methods for preparing media content
Introduced new methods for preparing media content: prepare,
prepareFromMediaId, prepareFromSearch, and prepareFromUri. These methods
allow MediaSession prepare media content rather than play
it. MediaSession will set up a queue or buffer their content during
these preparing requests.
The constants, FLAG_HANDLES_PREPARE_ONLY and EXTRA_PREPARE_ONLY, are
removed because the introduced methods can replace them.

Bug:25841735, Bug:25153060, Bug:25153353
Change-Id: I8fa2097c98fe2fba92b267d2865a9b75d118af09
2016-02-18 18:22:41 +09:00
Lajos Molnar
514a3fb7a6 media: expose audio sample format in MediaFormat
Bug: 27172163
Change-Id: I0ae4c0299839612893bb8a43e7016e49487e1a51
2016-02-17 18:52:36 -08:00
Arunesh Mishra
de15666923 Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev am: df8d02b074
am: 9f43371bae

* commit '9f43371bae759ba773ef179f091d9d5fdf668cad':
  SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:51:33 +00:00