Commit Graph

4600 Commits

Author SHA1 Message Date
Jae Seo
ba94f32b1b Merge "TIF: Define activity action to set up channel sources" into nyc-dev am: 12eb094232
am: 5d93925037

* commit '5d93925037a9d2ea99904aa4f5103f5d1122cf1f':
  TIF: Define activity action to set up channel sources
2016-02-25 18:47:50 +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
f0359ea9e2 Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev am: 596e1d3b7a
am: 7d8f449de2

* commit '7d8f449de21584c555d22c9aaeb05cf4fcdb64a4':
  Revert "Revert "ExifInterface: switch from using jhead to java implementation""
2016-02-25 14:38:11 +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 3c233ee291.

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

* commit '6614d3c74131f2c9c57f1930d80ade3c9a209aa6':
  Revert "ExifInterface: switch from using jhead to java implementation"
2016-02-25 11:59:50 +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 bf24c9fcb3.

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

* commit 'deb83688be2fa38695cc97e066db14b4f46df8a9':
  MediaSession: Add a way to get a calling package
2016-02-25 10:09:10 +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
9d1cb06a5d Merge "ExifInterface: switch from using jhead to java implementation" into nyc-dev am: 9ad5278e2b
am: 31b35a727c

* commit '31b35a727c0f8a04e5c95ca35b5c91fa257f50d0':
  ExifInterface: switch from using jhead to java implementation
2016-02-25 07:08:33 +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
3ad1022a77 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev am: 7dbef2da93
am: 5f2742afd8

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

* commit 'ba91d19dac5a961297bdc0e8d1975876f257282b':
  TIF: Add null-checking in Programs.Genres.encode/decode
2016-02-24 22:40:06 +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
3172041a23 Merge "ImageReader: skip callback when image reader is being closed" into nyc-dev am: dd44b8652c
am: 4f36c5f86d

* commit '4f36c5f86d72096f596c5bed1307a6b5429020ec':
  ImageReader: skip callback when image reader is being closed
2016-02-24 21:40:07 +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
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
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