10401 Commits

Author SHA1 Message Date
Jae Seo
46f7ff52b5 Merge "TIF: Enable per state input icon in TvInputInfo" into nyc-dev
am: 988a430793

* commit '988a4307939762069a536f9b69bc5ebf28a8e0fb':
  TIF: Enable per state input icon in TvInputInfo
2016-02-27 01:39:28 +00:00
Jae Seo
093fa4ebd8 TIF: Enable per state input icon in TvInputInfo
Also made the fields final and grouped them.

Bug: 23820259
Change-Id: I725c830d7c73e8cbc01b6a4f4f4991cb42258380
2016-02-26 16:54:11 -08:00
Jean-Michel Trivi
957a6cfd6d Merge "Audio record notification: report audio device information" into nyc-dev
am: 768d81374b

* commit '768d81374ba50d215064ca11ed3ca34cf46d087c':
  Audio record notification: report audio device information
2016-02-26 22:42:26 +00:00
Jean-Michel Trivi
768d81374b Merge "Audio record notification: report audio device information" into nyc-dev 2016-02-26 22:37:34 +00:00
Paul McLean
e6e21a6ec8 Merge "Fix unitialized member/init-parameter in AudioTrack(long) and AudioRecord(long)." into nyc-dev
am: c3f6a8e066

* commit 'c3f6a8e066167fc90a8d9e31fea794f4b35a023b':
  Fix unitialized member/init-parameter in AudioTrack(long) and AudioRecord(long).
2016-02-26 20:28:31 +00:00
Paul McLean
c707966397 Fix unitialized member/init-parameter in AudioTrack(long) and AudioRecord(long).
Bug: 27381351

Change-Id: Ia11c13bde978dbf1707439b82a18abf22fe23f2f
2016-02-26 13:13:02 -07:00
Jean-Michel Trivi
8ab728093e Audio record notification: report audio device information
Support querying the AudioDeviceInfo in AudioRecordConfiguration.
When AudioService (through RecordingActivityMonitor) receives
  a recording event on an existing session, report it as an
  update if the recording configuration has changed.

Bug 22876530

Change-Id: I1b72c08aa0589077fe8ad254087965e6384ce50a
2016-02-26 11:11:30 -08:00
Paul McLean
6d4ddbf520 Merge "JNI plumbing for native audio routing API" into nyc-dev
am: 0a8b9069b3

* commit '0a8b9069b344dbc1178cf604271b76a4fc4a9bd9':
  JNI plumbing for native audio routing API
2016-02-26 17:36:46 +00:00
Paul McLean
9b09e533ac JNI plumbing for native audio routing API
Bug: 23899814
Change-Id: I3a831bb661fbdfe1981ae3482fcc8773c7df22b6
2016-02-26 10:15:07 -07:00
Donghyun Cho
806865aaea Merge "MediaSession: Update javadoc of prepare-related methods" into nyc-dev
am: e9de43f888

* commit 'e9de43f8888fa8f6cfd060a260e7fcea765a76a2':
  MediaSession: Update javadoc of prepare-related methods
2016-02-26 08:26:35 +00:00
Donghyun Cho
e9de43f888 Merge "MediaSession: Update javadoc of prepare-related methods" into nyc-dev 2016-02-26 08:23:41 +00:00
Glenn Kasten
322b3fcccf Merge "Allow sample rate UNSPECIFIED to mean a route-dependent value" into nyc-dev
am: 642a4f5b66

* commit '642a4f5b66841788ffce5cf1d81ba744265db174':
  Allow sample rate UNSPECIFIED to mean a route-dependent value
2016-02-26 00:28:18 +00:00
Glenn Kasten
642a4f5b66 Merge "Allow sample rate UNSPECIFIED to mean a route-dependent value" into nyc-dev 2016-02-26 00:17:45 +00:00
Glenn Kasten
1cbf9b3741 Allow sample rate UNSPECIFIED to mean a route-dependent value
Bug: 25641253
Bug: 21019153
Change-Id: I3b8e01b6ea09f42c813ab1a0f3f625dc3803cc0b
2016-02-25 11:39:37 -08:00
Jae Seo
5d93925037 Merge "TIF: Define activity action to set up channel sources" into nyc-dev
am: 12eb094232

* commit '12eb094232fbb04e3ae8101f7566214947da1c3c':
  TIF: Define activity action to set up channel sources
2016-02-25 18:43:32 +00:00
Jae Seo
12eb094232 Merge "TIF: Define activity action to set up channel sources" into nyc-dev 2016-02-25 18:37:34 +00:00
Jaesung Chung
7d8f449de2 Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev
am: 596e1d3b7a

* commit '596e1d3b7a7080b44a293095d81a61175ac60c49':
  Revert "Revert "ExifInterface: switch from using jhead to java implementation""
2016-02-25 14:20:30 +00:00
Jaesung Chung
596e1d3b7a Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev 2016-02-25 14:14:28 +00:00
Jaesung Chung
15ef59e081 Revert "Revert "ExifInterface: switch from using jhead to java implementation""
This reverts commit 3c233ee291cfe1b765184920b6b7a69cb1bb82d9.

Bug: 27349581
Change-Id: Ib9f687e79ec36692fa7505ba3852099eb3e44573
2016-02-25 14:13:10 +00:00
Sungsoo Lim
6614d3c741 Merge "Revert "ExifInterface: switch from using jhead to java implementation"" into nyc-dev
am: b21622d477

* commit 'b21622d4773c64b9815818e71f8011ca17e79974':
  Revert "ExifInterface: switch from using jhead to java implementation"
2016-02-25 11:56:18 +00:00
Sungsoo Lim
b21622d477 Merge "Revert "ExifInterface: switch from using jhead to java implementation"" into nyc-dev 2016-02-25 11:50:43 +00:00
Sungsoo Lim
3c233ee291 Revert "ExifInterface: switch from using jhead to java implementation"
This reverts commit bf24c9fcb3e66b25c90c0cd51f8bf4f401f6c3d6.

Change-Id: Id278e831a9c03f615208fd6eab51c65f7bb019eb
2016-02-25 11:48:10 +00:00
Donghyun Cho
deb83688be Merge "MediaSession: Add a way to get a calling package" into nyc-dev
am: f72ecded69

* commit 'f72ecded696ff3145a9ee710e3ff4aeebb8aa1c5':
  MediaSession: Add a way to get a calling package
2016-02-25 10:05:19 +00:00
Donghyun Cho
f72ecded69 Merge "MediaSession: Add a way to get a calling package" into nyc-dev 2016-02-25 10:01:15 +00:00
Jaesung Chung
31b35a727c Merge "ExifInterface: switch from using jhead to java implementation" into nyc-dev
am: 9ad5278e2b

* commit '9ad5278e2babd4cc2764b0537febae8189f6306c':
  ExifInterface: switch from using jhead to java implementation
2016-02-25 05:40:06 +00:00
Jaesung Chung
9ad5278e2b Merge "ExifInterface: switch from using jhead to java implementation" into nyc-dev 2016-02-25 05:35:54 +00:00
Jae Seo
a6d34ee8b4 TIF: Define activity action to set up channel sources
Bug: 24776978
Change-Id: Ib176217bb896fa10db73c5aa8568171b9f6e2fe7
2016-02-24 18:44:21 -08:00
Jaesung Chung
bf24c9fcb3 ExifInterface: switch from using jhead to java implementation
Bug: 26044456, Bug: 11224701
Change-Id: I881ef0ead24bcec76c0fa5a7dd0b74cc71c77285
2016-02-25 10:57:27 +09:00
Arunesh Mishra
5f2742afd8 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev
am: 7dbef2da93

* commit '7dbef2da936093bf7e9e6bb3059c3825ce1e408d':
  Fix AlwaysOnHotwordDetector recognition event bug.
2016-02-24 23:18:45 +00:00
Arunesh Mishra
7dbef2da93 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev 2016-02-24 23:12:12 +00:00
Dongwon Kang
ba91d19dac Merge "TIF: Add null-checking in Programs.Genres.encode/decode" into nyc-dev
am: 523250b6b8

* commit '523250b6b886b524e13a990be832019559883af6':
  TIF: Add null-checking in Programs.Genres.encode/decode
2016-02-24 22:01:02 +00:00
Dongwon Kang
523250b6b8 Merge "TIF: Add null-checking in Programs.Genres.encode/decode" into nyc-dev 2016-02-24 21:51:22 +00:00
Zhijun He
4f36c5f86d Merge "ImageReader: skip callback when image reader is being closed" into nyc-dev
am: dd44b8652c

* commit 'dd44b8652ce633b40b95a2eed7c78da9ea678dea':
  ImageReader: skip callback when image reader is being closed
2016-02-24 21:30:42 +00:00
Zhijun He
dd44b8652c Merge "ImageReader: skip callback when image reader is being closed" into nyc-dev 2016-02-24 21:17:51 +00:00
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
05e63a254d Merge "Enable to set canRecord and tunerCount statically" into nyc-dev
am: ae262a8928

* commit 'ae262a8928b6bfd04896474406c35eeb998070c1':
  Enable to set canRecord and tunerCount statically
2016-02-24 17:57:33 +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
7fcbcdb134 Merge "Audio record notification: report client/device configuration" into nyc-dev
am: 16ad43c000

* commit '16ad43c00033dd8de3116f9604ee41047ce8f122':
  Audio record notification: report client/device configuration
2016-02-24 17:14:12 +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
c60f575669 Merge "Don\'t try caching null ringtones." into nyc-dev
am: 6bda33f6a0

* commit '6bda33f6a0f14200e8a70a437685c4ada933b4f5':
  Don't try caching null ringtones.
2016-02-24 16:59:34 +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
632dfe783b Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev
am: b4caa028c2

* commit 'b4caa028c2a4469a8488ba946e9e201aaded3f7e':
  TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER
2016-02-24 02:19:34 +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
Zhijun He
d1b91d467f Merge "ImageReader: override the flexible YUV compatible formats" into nyc-dev
am: c7a1b095a8

* commit 'c7a1b095a8f380b29f3f5108dd3e72f4898176b1':
  ImageReader: override the flexible YUV compatible formats
2016-02-24 01:50:57 +00:00