Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
394,809 Commits 3 Branches 0 Tags
f660c012b080496eb70ea77f141f346e80bb6cfa
Commit Graph

7184 Commits

Author SHA1 Message Date
Jeff Sharkey
f660c012b0 Merge "Add support for "Audiobooks"." 2018-12-04 16:58:17 +00:00
Chong Zhang
c13bfd871d Merge "Fix ExifInterface for .heic when meta is at the end" am: 98c9cd7b20 am: 17fc70b1ee 
am: 79fa7d39c3

Change-Id: I33880ecff74ecdc2a60b0857b3cb8e8164232030
 2018-12-03 19:37:53 -08:00
Chong Zhang
79fa7d39c3 Merge "Fix ExifInterface for .heic when meta is at the end" am: 98c9cd7b20 
am: 17fc70b1ee

Change-Id: Ib3073cfac59888d707583efd9a9fda1d3731f103
 2018-12-03 19:24:28 -08:00
TreeHugger Robot
3af0f3a7c3 Merge "Specify AudioTrack HWAVSync timestamp units as nanoseconds" 2018-12-04 02:49:33 +00:00
Dean Wheatley
bff3dae809 Specify AudioTrack HWAVSync timestamp units as nanoseconds 
Clarify the documentation by specifying the units of
the timestamp for the HWAVSync case

Bug: 63901775
Test: make
Change-Id: Ida39a3ee5e6b4b0d3255bfef95601890afd80709
 2018-12-03 09:29:47 -08:00
TreeHugger Robot
5b101d1348 Merge "RingtoneManager: add @Nullable to openDefaultRingtoneUri()." 2018-12-03 15:00:39 +00:00
Robert Shih
cd0ee52248 Merge "MediaPlayer2: Move Drm APIs into DrmHandle subclass" 2018-12-01 04:29:34 +00:00
Dongwon Kang
0d8fe14ad7 RingtoneManager: add @Nullable to openDefaultRingtoneUri(). 
Bug: 120072398
Test: make update-api
Change-Id: I9fd43ac80f643fe81b4ed16d84b4253f19899c1c
 2018-11-30 16:18:44 -08:00
Chong Zhang
317316fb2b Fix ExifInterface for .heic when meta is at the end 
available() bytes is counted after the last read position,
after the seek to new position, size should be compared
with the avaliable directly (without adding position).

bug: 120086693
test: Open .heic files in Downloads/Photos that's either
very small (b/117625929, b/111897855), or with the meta
at the very end (b/120086693). There shouldn't be error
in ExifInterface.
Change-Id: I37ac57823b26f03bb0ba555ee6213cf999942d21
 2018-11-30 15:37:03 -08:00
Jeff Sharkey
10887d5e5a Add support for "Audiobooks". 
Bug: 113356944
Test: manual
Change-Id: Ifed54c41a533ed2d556dc6561ea498ec293991a6
 2018-11-30 13:53:19 -07:00
Hyundo Moon
9a908db9f4 Rename KeyEvent.isMediaKey() to isMediaSessionKey() 
Since not all KEYCODE_MEDIA_* keycodes return true in isMediaKey(),
the naming can give confusion. This CL renames the method to
isMediaSessionKey() and revises its Javadoc.

Bug: 119789707
Test: make -j
Change-Id: I36786ccf5606977e6d971c13d77d950356561bda
 2018-11-30 13:54:32 +09:00
Robert Shih
488be992a4 MediaPlayer2: Move Drm APIs into DrmHandle subclass 
Bug: 119675660
Test: MediaPlayer2DrmTest
Change-Id: I7a48ec1c2b4ba86752b12935b275140f03978495
 2018-11-29 20:42:03 -08:00
TreeHugger Robot
5f0c9331cc Merge "Make AudioManager.FLAG_FROM_KEY as @SystemApi" 2018-11-30 04:03:30 +00:00
TreeHugger Robot
83fc1328d7 Merge "Commenting exit condition from read thread." 2018-11-30 00:16:14 +00:00
Paul McLean
0d8753073a Commenting exit condition from read thread. 
Silence spurious exception error reporting.

Test: Run CTS and CTSVerifier Midi tests.
Bug: 114123487
Bug: 120225301

Change-Id: I82b13e563c30ba42e02625cfe57bd27897cb8035
 2018-11-29 13:43:22 -07:00
TreeHugger Robot
04eaec037e Merge "MediaPlayer2: rename Media2DataSource to DataSourceCallback" 2018-11-29 16:27:21 +00:00
Hyundo Moon
888b791f29 Make AudioManager.FLAG_FROM_KEY as @SystemApi 
Bug: 119790339
Test: make update-api
Change-Id: I649cd5cbf64274e5fe840eb773a450c3c581b210
 2018-11-29 13:35:51 +09:00
Wei Jia
073e1b11b3 MediaPlayer2: rename Media2DataSource to DataSourceCallback 
Test: cts
Bug: 112549021
Change-Id: I4f623d2c94e855f7af51f20a207db05b6da4b221
 2018-11-28 16:54:57 -08:00
TreeHugger Robot
1dbe2b2092 Merge "AudioService: monitor assistant and accessibility services" 2018-11-28 23:38:13 +00:00
TreeHugger Robot
7f0503a4c9 Merge "MediaPlayer2: use ParcelFileDescriptor" 2018-11-28 22:34:13 +00:00
Eric Laurent
1c9c1d53b2 AudioService: monitor assistant and accessibility services 
Add monitoring of voice interaction service, assistant and
accessibility services changes and communicate corresponding UIDs
to audio policy service.
Those are needed to implement the concurrent audio capture policy.

Test: enable and disable Google Assistant and Voice Access.
Bug: 111438757

Change-Id: Ia20b54a70c0445113bd53b03b04a325dcf7940fb
 2018-11-28 09:18:26 -08:00
Wei Jia
da21c3d3df MediaPlayer2: use ParcelFileDescriptor 
Test: cts
Bug: 112549021
Change-Id: Ic1644e82558cc47fcba1152d8a1c7c10b6f7ef8c
 2018-11-28 09:06:46 -08:00
Jeff Sharkey
c583071b97 Merge changes from topic "exifz" 
* changes:
  Track attribute ranges, parse additional times.
  Sane undefined behaviors for XmlUtils.
 2018-11-28 16:03:04 +00:00
Dongwon Kang
328d44264c Merge "MediaPlayer2: replace external constant annonations with local ones" 2018-11-28 01:13:55 +00:00
Dongwon Kang
9a38e474e8 Merge "Media2HTTPConnection: remove hidden API usage, NetworkUtils.numericToInetAddress()" 2018-11-28 01:13:12 +00:00
TreeHugger Robot
07f69e6616 Merge "MediaPlayer2: replace Preconditions (internal api) with Media2Utils." 2018-11-28 01:08:34 +00:00
Dongwon Kang
4c7fc50795 MediaPlayer2: replace external constant annonations with local ones 
Test: build
Bug: 112766913
Change-Id: I94f110caed01b5aa8ec56bff2d9da8a7d5dcc4b9
 2018-11-27 16:58:06 -08:00
Dongwon Kang
dfd0ca889f Media2HTTPConnection: remove hidden API usage, NetworkUtils.numericToInetAddress() 
Test: build
Bug: 112766913
Change-Id: Id383a06460034aa51654987249119e6bff3b7dde
 2018-11-27 16:58:06 -08:00
Paul McLean
b3ae6d9490 Move JNI init for OpenSLES audio routing to system startup. 
Moved AudioTrack.CHANNEL_COUNT_MAX and AudioTrack.native_get_FCC_8() to AudioSystem.

Bug: 115560661
Test: build/install/run native audio routing CTS
Change-Id: I03b14a0302aa0d6a1bc78f4daf5a521446042f66
 2018-11-27 14:00:34 -07:00
Jeff Sharkey
dffaa69997 Track attribute ranges, parse additional times. 
An upcoming privacy feature is interesting in knowing the exact
offset and length of specific Exif tags, similar to how the thumbnail
range is already being returned.  Detect the case where we've modified
the underlying file, meaning ranges are no longer valid.

Add constructor to accept best-practices File object.  Add method to
ask if a given tag has been defined.  Add methods to parse additional
timestamp values.

Bug: 115377970, 111892141
Test: atest android.media.cts.ExifInterfaceTest
Change-Id: Iac35bb65ff7b3605d6c32ec3ca3d29b17e65cff8
 2018-11-27 13:39:03 -07:00
Dongwon Kang
0c0e939d59 MediaPlayer2: replace Preconditions (internal api) with Media2Utils. 
Also setting sdk_verion for mediaplayer2.proto

Test: build
Bug: 112766913
Change-Id: I537ee296d9e1a0b127567943a68dc985a48ad86f
 2018-11-26 20:16:54 -08:00
TreeHugger Robot
e48305da06 Merge "Hook up MediaExtractor getAudioPresentations to native impl" 2018-11-27 01:49:18 +00:00
Dichen Zhang
898dd65029 Merge "Revert "Make AudioManager.generateAudioSessionId() static"" 2018-11-26 23:34:18 +00:00
Sampath Shetty
08e7706d92 Hook up MediaExtractor getAudioPresentations to native impl 
Adds interface to MediaExtractor JNI to retrieve AudioPresentations

Test: Manual test
Bug: 119312182
Change-Id: I5802ff20b8221aeede25148cb3213b0e9e74f270
 2018-11-26 15:24:41 -08:00
Dichen Zhang
f50b236b95 Revert "Make AudioManager.generateAudioSessionId() static" 
This reverts commit 2d767d2f8b.

Bug: 119775358
Test: MediaPlayer2Test, androidx media2 integration
Change-Id: I1ea474a6fd02f54e8fa983edf7e188cc732fa7cc
 2018-11-26 13:30:46 -08:00
ybai
14d2d59f1c Add MIMETYPE_AUDIO_AC4 support in MediaFormat 
Add support for MIMETYPE_AUDIO_AC4 in MediaCodecInfo

Bug: 119312182
Test: make offline-sdk-docs

Change-Id: Ia6fc708886e2198bead31ac04c04a679456a3527
 2018-11-26 10:00:20 -08:00
Sungsoo Lim
96a62ff0a1 Merge "Remove SessionToken2Provider" 2018-11-23 00:09:27 +00:00
Sungsoo Lim
9381adfbd4 Remove SessionToken2Provider 
Bug: 119591238
Test: build
Change-Id: I71be4db9f0f7f245e8d8d04ca3400320b623a47a
 2018-11-22 14:53:35 +09:00
Sungsoo Lim
00d0bb3818 Fix AudioAttributes.setContentType 
Test: build
Change-Id: Icfafeb3069010bf73c3d3e00f19c62c5fbf0e437
 2018-11-22 13:51:53 +09:00
TreeHugger Robot
e9e01e2cfe Merge "Remove unused Media 2.0 APIs" 2018-11-22 02:13:39 +00:00
Sungsoo Lim
6f7a0f4650 Remove unused Media 2.0 APIs 
Bug: 119591238
Test: build
Change-Id: I58d00b64c86df1372eaed74899227d5787d127e2
 2018-11-21 09:29:34 +09:00
Dichen Zhang
cb90c260fc Fix setAudioSessionId() Racing Issue 
Pointed out by Wei: a later setAudioSessionId() could override the
previous one whose task has not completed.

Bug: 112549970
Test: MediaPlayer2Test
Change-Id: Ib5862d6dfd1ea4ddcbccb421906510ab4a3bae87
 2018-11-21 00:28:09 +00:00
Wei Jia
0a91bc975e Merge "DataSourceDesc: refactor to base class and subclasses" 2018-11-20 22:06:36 +00:00
Dichen Zhang
197f242110 Merge "Make AudioManager.generateAudioSessionId() static" 2018-11-20 21:50:59 +00:00
Sungsoo Lim
72223c2f24 Merge "Remove unused MediaBrowser2 and relevant classes" 2018-11-20 01:43:48 +00:00
Dichen Zhang
2d767d2f8b Make AudioManager.generateAudioSessionId() static 
Bug: 119775358
Test: MediaPlayer2Test
Change-Id: Ie4fe5088c9d5f2c3bae251ed8cb0fa2e0a7038f8
 2018-11-19 13:14:57 -08:00
Andrew Solovay
49e3049613 Merge "docs: Fixing typos." into pi-dev am: 94a49c90a7 
am: 0db8a96a7c

Change-Id: Ib4e0492fb8b58acb215c566f60d9f3156687b278
 2018-11-19 10:11:08 -08:00
Andrew Solovay
0db8a96a7c Merge "docs: Fixing typos." into pi-dev 
am: 94a49c90a7

Change-Id: I21aeb887a0bc4001ce4926909e1ce197fc0eb85f
 2018-11-19 09:57:19 -08:00
Sungsoo Lim
049a32c1ff Remove unused MediaBrowser2 and relevant classes 
Bug: 119591238
Test: build
Change-Id: Ib657b2e74666b957a4c3667e60a7c1ef02e0bc62
 2018-11-19 23:19:25 +09:00
TreeHugger Robot
7e0404f1d3 Merge "Stop throwing exception when re-starting MediaProjection" 2018-11-19 09:38:17 +00:00