Commit Graph

6811 Commits

Author SHA1 Message Date
Adrian Roos
d4f9f9f666 Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5
am: 963172ac83

Change-Id: I2251db66ef73d5b69c84b4e83f2788d2bc953eda
2018-12-12 08:44:43 -08:00
Adrian Roos
963172ac83 Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi"
am: af0e1c2fa5

Change-Id: I016cacee1e1de6c7a8269fc3605ed25716598d9e
2018-12-12 08:33:17 -08:00
Adrian Roos
6115769c16 API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Merged-In: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-12 15:02:26 +01:00
Xin Li
75f75c18cc DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Bug: 120502534
Change-Id: I7351a1832c4bd2fd86324183ab83e9088d716822
2018-12-10 12:30:19 -08:00
Orion Hodson
2e09a6b61a Merge "Remove ScopedBytes use" am: 422fa22456
am: 7c58021208

Change-Id: I8c552ea28fa7fb5577a7932c599a0f615df28125
2018-12-09 12:16:36 -08:00
Treehugger Robot
422fa22456 Merge "Remove ScopedBytes use" 2018-12-09 19:36:28 +00: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
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
Orion Hodson
9b909c3b70 Remove ScopedBytes use
The libnativehelper ScopedBytes class is being deprecated. It's use in
android_media_AudioTrack.cpp is unnecessary because the JNI method
takes a direct buffer as an argument whereas ScopedBytes classes exist
to mask the difference between byte arrays and byte buffers.

Bug: 119840313
Test: m -j32
Change-Id: I2a6478dbaa861c5391cc298871df0f8cd1f1439c
2018-11-27 17:54:05 +00:00
Andrew Solovay
0db8a96a7c Merge "docs: Fixing typos." into pi-dev
am: 94a49c90a7

Change-Id: I21aeb887a0bc4001ce4926909e1ce197fc0eb85f
2018-11-19 09:57:19 -08:00
Andrew Solovay
bcaedc102d docs: Fixing typos.
Doc is staged to:

http://go/dac-stage/reference/android/media/audiofx/AudioEffect
http://go/dac-stage/reference/android/media/audiofx/AudioEffect.OnControlStatusChangeListener
http://go/dac-stage/reference/android/media/audiofx/AudioEffect.OnEnableStatusChangeListener

Bug: 119656338
Change-Id: I813610941ae0f317944a75687f354cc9f66e8600
Exempt-From-Owner-Approval: Doc-only change
Test: make ds-docs
2018-11-16 15:40:04 -08:00
mtk33169
51a8342f5f Merge "The JE about "android.process.media" will pop up when you eject the SD card after you set SD as internel phone storage" am: 83269acba7
am: a10effa6d4

Change-Id: Ibae7dcc2c76062b5a64a6d0825abafc8fa015eea
2018-11-12 19:52:47 -08:00
mtk33169
03ae44a8ff The JE about "android.process.media" will pop up when you eject the
SD card after you set SD as internel phone storage

This JE is happening due to null pointer access in makeEntryFor() in
MediaScanner.Java.
Before accessing the cursor, check if cursor is available and not null.
It is a safe check.

Bug: 119392250
Test: manual, ran test 20 times and it passed every times.
Change-Id: I23039281b63a0a6a411860eb5989cf20a5663c8f
2018-11-12 10:49:55 +00:00
Marco Nelissen
2ed56610e8 Merge "Add key for sample rate and bits per sample" am: f7c4c728fc
am: f4f1adbf8f

Change-Id: I64ceb88b1d7b40e8019fb11ce47307cf7c18df65
2018-11-03 18:21:30 -07:00
Daniel Bonnevier
56a9a6631a Add key for sample rate and bits per sample
Add new keys for sample rate and bits per sample.
This makes it possible to indicate the specification of
the music files on application.

Bug: 112986969
Test: Check if sample rate and bits per sample can be retrieved

Change-Id: Ie5a90800297a0a7c2dd6f3a2bdf9e88c9221bee1
2018-11-02 19:49:48 +09:00
Chong Zhang
194a3a7587 Merge "Add keys to retrieve color aspects from metadata" am: 6636b0227d
am: a2ec9e32c6

Change-Id: I20dd7e842ae0a8172a188b4d1889daea759e14b2
2018-10-24 20:27:47 -07:00
Chong Zhang
e8c39f3ba0 Merge "Color aspects keys information stored database" am: e4c918ba8e
am: 89c615866a

Change-Id: Ida5168cf1cea927dd79a9c2bacee0a156af60b76
2018-10-24 20:22:18 -07:00
Chong Zhang
6636b0227d Merge "Add keys to retrieve color aspects from metadata" 2018-10-25 02:04:48 +00:00
Nathan Harold
41e2d7494f Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed
am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e
2018-10-24 16:14:06 -07:00
Chong Zhang
65a4a60827 Merge "Fix data source for HEIF exif extractor" am: 31bbb473ce
am: e655bf6d4b

Change-Id: I72f1593d281f3c9aca56d9cc87fe13b08c36316b
2018-10-24 16:04:34 -07:00
Toshikazu Saito
92ccb271ce Merge "Change caught exception in MediaScanner when ExifInterface is created" am: 0915931939
am: 544c774381

Change-Id: Ie3c04473e274b49b6c4bb7cb40f4d675453efd5c
2018-10-24 15:58:40 -07:00
Toshikazu Saito
26b3de310f Add keys to retrieve color aspects from metadata
Add keys to retrieve color standard, color transfer and color range from
MediaMetadataRetriever.

Bug: 114329709
Test: put hdr/non-hdr contents and check media db

Change-Id: Ifa90f12a572b330f87acd6ef06e1e83ddceb8483
2018-10-23 23:37:31 +00:00
nobuhiko saitou
839cc00889 Color aspects keys information stored database
Add keys for color aspects to VideoColumns in MediaStore.
And standard, transfer and range is stored to database.

Bug: 114329709
Test: put hdr/non-hdr contents and check media db

Change-Id: Id4bf27a35720f5cf5a60f08eb3f30314e1a1a167
2018-10-23 22:03:30 +00:00
Nathan Harold
f5cf9f24ed Merge "Move some members to the "Q blacklist"." 2018-10-23 21:53:51 +00:00
Treehugger Robot
31bbb473ce Merge "Fix data source for HEIF exif extractor" 2018-10-23 17:36:33 +00:00
Mathew Inwood
45d2c252b1 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 8c854f86a4)
2018-10-22 17:28:24 -07:00
Chong Zhang
f2b041dce0 Fix data source for HEIF exif extractor
Do not allow the source to read past available bytes, since
the underlying input stream may not be able to seek after that.

For input streams from files, the available bytes is usually the
file size, and we usually don't have problem when the file is
of decent size. But when the file is very small, some of the
extractors (other than mp4) would request bytes past the end
of the file, which goes over the available range. Once that
condition is hit, we can't reset to the offet needed for
mp4 extractor and heif parsing would fail.

bug: 111897855
bug: 117625929
test: open heic files of various sizes in Files (Downloads) app,
check that ExifInterface shouldn't encounter any exceptions.

Change-Id: I668ff900f4155dc310cb7ea8977bbe091791c5d7
2018-10-22 16:02:33 +00:00
Toshikazu Saito
a74c77991a Change caught exception in MediaScanner when ExifInterface is created
Some HEIF content happens RuntimeException in ExifInterface because
sniff is failed and MediaExtractor is not found. If exception happens,
scanning is aborted. So all contents may not be registered to database
correctly. To avoid that, this fix changes caught exception from
IOException to Exception for creating ExifInterface.

Bug: 117625929
Test: put some HEIF contents and check on photos

Change-Id: I6d32dec27c3be13993ec08f92d567b772d03ace9
2018-10-22 09:25:43 +00:00
weichinweng
4ee1409540 Merge "AudioService: Add Hearing Aid Switch Control" am: f3b7821fbd
am: c91b0fdfeb

Change-Id: If26a9b0c561a8ba8da761aaba634d705e063f315
2018-10-18 14:38:10 -07:00
weichinweng
c91b0fdfeb Merge "AudioService: Add Hearing Aid Switch Control"
am: f3b7821fbd

Change-Id: I6abbbc268a8c391e2d400e7a9811ea0e04362bfc
2018-10-18 14:18:06 -07:00
weichinweng
0de4adc7ca AudioService: Add Hearing Aid Switch Control
1) Add setBluetoothHearingAidDeviceConnectionState interface to control
suppressNoisyIntent flag.
2) Add check to confirm the previous device is active or not when want
to clean it.

Bug: 112279820
Test: Build Pass, BT off/on when play A2DP, Switch active device
Change-Id: I73f1236d44213c6cf4a2708f3c96144416cfa67d
Merged-In: I73f1236d44213c6cf4a2708f3c96144416cfa67d
2018-10-18 13:31:11 -07:00
weichinweng
c30a3e8d1c AudioService: Add Hearing Aid Switch Control
1) Add setBluetoothHearingAidDeviceConnectionState interface to control
suppressNoisyIntent flag.
2) Add check to confirm the previous device is active or not when want
to clean it.

Bug: 112279820
Test: Build Pass, BT off/on when play A2DP, Switch active device
Change-Id: I73f1236d44213c6cf4a2708f3c96144416cfa67d
2018-10-18 07:28:39 +08:00
kopriva
fcc09fe17e Merge "docs: bug 37007350, missing word" into pi-dev
am: 2f38a21898

Change-Id: I3357eaa30229fb1831e42ae63ba8bef9fca1376e
2018-10-08 19:06:03 -07:00
kopriva
d104c81916 docs: bug 37007350, missing word
Test: make ds-docs

Bug: 37007350

Change-Id: Ibbff4232f67e7c955b182ff9f3b97250bb15c310
Exempt-From-Owner-Approval: Docs-only change
2018-10-08 15:24:21 -07:00
kopriva
b0fdbca951 docs: bug 37127405, typo
am: cce5e4f4a2

Change-Id: Ibf98603127f39b6b7ed6bb6d7790121ed678c598
2018-10-04 16:48:19 -07:00
Andrew Solovay
d10e384d6c resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 22:50:39 +00:00
kopriva
cce5e4f4a2 docs: bug 37127405, typo
Test: make ds-docs

Bug: 37127405

Change-Id: I40892ad7248d95a562d6af448ce4d475c79fd19f
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 14:09:04 -07:00
Andrew Solovay
a3e34fe9fe Merge "docs: Replacing {#link with {@link" into pi-dev 2018-10-04 20:06:59 +00:00
Andrew Solovay
a44f2c075b docs: Replacing {#link with {@link
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.

Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.

Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.

Staged to:

go/dac-stage/reference/android/app/Instrumentation.html
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html
go/dac-stage/reference/android/bluetooth/BluetoothDevice.html
go/dac-stage/reference/android/bluetooth/BluetoothServerSocket.html
go/dac-stage/reference/android/inputmethodservice/InputMethodService.html
go/dac-stage/reference/android/view/KeyCharacterMap.html
go/dac-stage/reference/android/view/KeyEvent.html
go/dac-stage/reference/android/media/AudioManager.html
go/dac-stage/reference/android/net/wifi/WifiConfiguration.html

(Other files were not in the public Javadocs.)

Bug: 111925950
Test: make ds-docs
Exempt-From-Owner-Approval: Docs-only change
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 18:20:51 +00:00
kopriva
200b55a7e3 Merge "docs: bug 37070633, wrong method name" into pi-dev
am: d6301096ce

Change-Id: Ia5e127c9a2bc7d6aba92e46d3fc554e222884b65
2018-10-02 20:25:06 -07:00
kopriva
8cdc615ccd docs: bug 37070633, wrong method name
Test: make ds-docs

Bug: 37070633

Change-Id: I0e95ce9ac14f00395ddcd0c74bf450ff77178255
Exempt-From-Owner-Approval: Docs-only change
2018-10-02 16:02:39 -07:00
Jeff Sharkey
8fe3754f1a Merge changes from topic "bugfix_content_path" am: aa642187cd
am: f8ad474935

Change-Id: Ic5bbd68c327e6ad26ba3ddbd19ca5ea277396452
2018-10-01 11:40:25 -07:00
Jeff Sharkey
f8ad474935 Merge changes from topic "bugfix_content_path"
am: aa642187cd

Change-Id: Ice15a2cffcaf96a370f8e73ebe0a25bdea67f1c3
2018-10-01 11:25:38 -07:00
kopriva
a92c529705 Merge "docs: bug 37070226, sates typo" into pi-dev
am: bfbfd12a2c

Change-Id: I8e2657148e06b21238f4f444ce29380f4837ab3d
2018-09-28 14:23:05 -07:00
kopriva
cce2d3211e docs: bug 37070226, sates typo
Test: make ds-docs

Bug: 37070226

Change-Id: I122715a93ae47fc5d8654b0a2fce8bb817c813c8
Exempt-From-Owner-Approval: Docs-only change
2018-09-27 15:01:04 -07:00
nobuhiko saitou
436b7b5634 Add OEM_SOUNDS_DIR variable
Add OEM_SOUNDS_DIR variable
And add judgment of OEM_SOUNDS_DIR in isSystemSoundWithMetadata.

Test: build and check sound like ringtone etc
Bug: 79123178

Change-Id: Ib432910c7a99695e73c88480b7028be1c9d04702
2018-09-20 16:05:54 +09:00
kopriva
16eb89477b Merge "docs: bug 37037879, typo" into pi-dev
am: e71b05a211

Change-Id: Iee76dc0a909c763e4a50ede80c9793cdf21c421a
2018-09-13 18:51:53 -07:00
kopriva
15e5b767d6 docs: bug 37037879, typo
Test: make ds-docs

Bug: 37037879

Change-Id: I840f34f94f3346e20e53b3104cec3890d4b9fc72
Exempt-From-Owner-Approval: Docs-only change
2018-09-13 15:20:19 -07:00
Tomoharu Kasahara
76b988ad23 Merge "Convert AudioAttribute to Stream correctly for TTS" am: 874e10f4a6
am: 96b6adc014

Change-Id: Id90684e28b0fc33be3301c6adf0683be239ae0d0
2018-09-11 13:44:31 -07:00
Tomoharu Kasahara
96b6adc014 Merge "Convert AudioAttribute to Stream correctly for TTS"
am: 874e10f4a6

Change-Id: I52a610027d11574ab51cd83683de64ff2dddadfe
2018-09-11 13:35:21 -07:00