13109 Commits

Author SHA1 Message Date
Philip P. Moltmann
441f0283fb Allow ignoring return values when checking if class is mockable
Test: make -j javac-check RUN_ERROR_PRONE=true
Change-Id: I5094fa145fc5f6d5c5d9426b07d764c07e545819
Merged-In: I5094fa145fc5f6d5c5d9426b07d764c07e545819
2018-08-28 09:53:19 -07:00
Chih-Hung Hsieh
5de6996772 Fix errors in LOG_FATAL_IF arguments.
They were found only when compiled with clang-tidy.

Bug: 111850071
Test: build with WITH_TIDY=1
Change-Id: I696b9095dc44e9ed7a8a7a90346804a01de39072
Merged-In: I696b9095dc44e9ed7a8a7a90346804a01de39072
(cherry picked from commit acb1de84434480d80a33499d93df1e14f1f2ed03)
2018-08-23 14:28:15 -07:00
Mathew Inwood
473b9d5bfc Add @UnsupportedAppUsage annotations
For packages:
  android.media.tv
  android.media.soundtrigger
  android.media.session
  android.media.projection
  android.media.midi
  android.media.effect.effects
  android.media.effect
  android.media.browse
  android.media.audiopolicy
  android.media.audiofx
  android.media

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I9b58cb2d1e02d9156a7b0d19c1feff4bcd2c53a9
Merged-In: I3bd40136d7fc948f66eca6b2d139c15e39c5a248
2018-08-17 09:07:01 +01:00
Treehugger Robot
43f3f60ec0 Merge "Code reformatting for upcoming automated code changes." 2018-08-16 07:45:35 +00:00
Mathew Inwood
9feefd2f5f Merge "Add @UnsupportedAppUsage annotations" 2018-08-15 11:37:37 +00:00
Gerry Fan
7955aec0ea Merge "Add Nullable to MediaHTTPService's mCookies." 2018-08-15 00:13:59 +00:00
gfan
73371d7503 Add Nullable to MediaHTTPService's mCookies.
Bug: 29321867
Test: manually tested with ndk sample native-audio
Change-Id: Ic30fe7c28db0111ee5bcb91b037b7c4536dcfd06
2018-08-14 15:10:49 -07:00
Nan Zhang
d4562064b6 Convert com.android.media.remotedisplay.stubs-gen docs
Checked AOSP master, and found that this module haven't been migrated
yet after pi-dev codebase been merged back to AOSP.

Test: m -j RemoteDisplayProviderTest is successful and does not show any
link-type check warning.
Bug: b/70351683

Change-Id: I227fe8c0a19582cf3f095a8e773ca0bdd81b0a0a
2018-08-12 12:55:56 -07:00
Mathew Inwood
d237a74ff4 Add @UnsupportedAppUsage annotations
For packages:
  android.service.wallpaper
  android.service.vr
  android.service.voice
  android.service.trust
  android.service.textservice
  android.service.restrictions
  android.service.resolver
  android.service.quicksettings
  android.service.power
  android.service.pm
  android.service.persistentdata
  android.service.oemlock
  android.service.notification
  android.service.media
  android.service.gatekeeper
  android.service.fingerprint
  android.service.euicc
  android.service.dreams
  android.service.diskstats
  android.service.chooser
  android.service.carrier
  android.service.battery
  android.service.autofill
  android.service.appwidget
  android.service

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I50fb66b55bbc82cc505b483c98f8bd09ae0b5020
Merged-In: I51645d8a8cdce3015749fc27e34830e822ef41ae
2018-08-10 09:58:47 +01:00
Mathew Inwood
c97c5c04f1 Add @UnsupportedAppUsage annotations
For packages:
  android.mtp

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I6af7c9405b0ac3c2d30307dd04d6d330cd22bda4
Merged-In: Id97d70dc1003cd7c6ed585d647bf0df0fd7a946a
2018-08-09 17:29:53 +01:00
Mathew Inwood
a44c098996 Code reformatting for upcoming automated code changes.
Adding annotations to individual fields cannot be easily done when there
are two fields defined in a single statement. Put each definition in a
statement of its own.

See go/UnsupportedAppUsage for more context.

Bug: 110868826
Test: m
Change-Id: I7c521973bd8856414b2d2e39573d887e426c69fc
2018-08-08 15:25:51 +01:00
Mathew Inwood
230017d9b9 Merge "Add @UnsupportedAppUsage annotations"
am: f336c03135

Change-Id: Iae7c937caa23432a3851137f6234d0de19a3ed0c
2018-08-06 09:43:09 -07:00
Mathew Inwood
eb85b9bd3c Add @UnsupportedAppUsage annotations
For packages:
  android.filterfw
  android.filterfw.core
  android.filterfw.format
  android.filterfw.geometry
  android.filterfw.io

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I6110238f11ab2a81cf84d0fbadf924bc25ab9374
Change-Id: I3dc7c93ae9fcfd0e9a1bc3e6ccc678a77e9c4709
2018-08-06 10:56:08 +01:00
Steven Moreland
9f590ad031 libmedia2_jni: use libbinder as shared library
In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.

Bug: 111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43
(cherry picked from commit a192e0e31400ac5a2b9d69788c7a60a89fb6c6ed)
Merged-In: If7f8bd931dae5310eda6c230f20179418c2efa43
2018-07-18 17:20:44 +00:00
Eric Laurent
3ee7b6ca84 Add field to set A2DP device volume on connect (1/2)
Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.

Bug: 79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: Iea13ca8b5c538c999149baba6e9069745ad9466b
Merged-In: I909fa3f40818c595fc977695fbfa1214f9a4de72

(cherry picked from commit 3e6fb6309033c50081c0789b5905d5cd539b38f6)
2018-06-07 22:32:24 +00:00
Treehugger Robot
c55e1b6f4d Merge "com.android.mediadrm.signer is built with java_sdk_library" 2018-06-07 11:27:25 +00:00
TreeHugger Robot
611488ceac Merge "com.android.mediadrm.signer is built with java_sdk_library" into pi-dev-plus-aosp 2018-06-07 01:20:04 +00:00
Emilian Peev
d60a056d7c Merge "media: Check window connect status in ImageWriter" into pi-dev
am: 596fea9581

Change-Id: If1fee999ef937e74bf4ac23380e27dbea231655a
2018-06-06 14:51:26 -07:00
Emilian Peev
2adf40392e media: Check window connect status in ImageWriter
ImageWriter clients could pass invalid or already
connected surface during initialization. Check the
status after trying to connect to the producer
interface and raise an exception if necessary.

Bug: 80086132
Test: Camera CTS
Change-Id: I46810885046a3b89ea18510574c22db27e812a9c
2018-06-06 09:57:15 +00:00
Sundong Ahn
9217ae6feb Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" am: bd83ac0ecc
am: 7295fd2af4

Change-Id: Ib1964e9082209649f7e909bc075da1a61efc2af1
2018-06-04 11:31:38 -07:00
Treehugger Robot
bd83ac0ecc Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" 2018-06-04 04:54:27 +00:00
Sundong Ahn
63bdde81a3 com.android.mediadrm.signer is built with java_sdk_library
The com.android.mediadrm.signer is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.mediadrm.signer is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.

Bug:77577799
Test: make -j
Test: make checkapi

Merged-In: I0e773615abe6aa8d757e489de2b9d807cd356146
Change-Id: I0e773615abe6aa8d757e489de2b9d807cd356146
(cherry picked from commit 2e1089bae43fe327346c531fcbdd4cc5d1664b14)
2018-06-04 10:23:52 +09:00
Sundong Ahn
011bb72079 com.android.mediadrm.signer is built with java_sdk_library
The com.android.mediadrm.signer is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.mediadrm.signer is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
      grep com.android.mediadrm.signer
      And check the com.android.mediadrm.signer library

Merged-In: I0e773615abe6aa8d757e489de2b9d807cd356146
Change-Id: I0e773615abe6aa8d757e489de2b9d807cd356146
(cherry picked from commit 2e1089bae43fe327346c531fcbdd4cc5d1664b14)
2018-05-31 20:16:36 +09:00
Robert Shih
ef157649d5 Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
am: e3348a2593

Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c
2018-05-30 11:13:45 -07:00
Robert Shih
e3348a2593 Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev 2018-05-30 17:43:58 +00:00
Robert Shih
97825a4fd0 MediaCodec.CryptoInfo: expose subsample encryption pattern
Bug: 31215085
Test: com.google.android.media.gts.WidevineMp4TempTests
Change-Id: I6965adc646684053633530e39258b171724b34bc
2018-05-25 17:44:56 -07:00
Robert Shih
5ecf175573 Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
am: 300ab58e9a

Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10
2018-05-25 16:15:40 -07:00
TreeHugger Robot
300ab58e9a Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev 2018-05-25 23:01:53 +00:00
Robert Shih
9a7cca9106 Add cleartextTrafficPermitted to MediaFrameworkTest
Bug: 75276616
Test: this
Change-Id: I520950a148658e9f1602e1b4657dd0273bdaf0e2
2018-05-25 12:01:06 -07:00
Jaewan Kim
0349869c06 Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev
am: 0e7a307e14

Change-Id: I455466d79d0c1b534d87b33cdb787194422a51bf
2018-05-24 12:39:29 -07:00
Daisuke Teranishi
2e92e5c30b Merge "Use correct filename when adding to ringtone" am: daff857ffd
am: 24062f05d3

Change-Id: Id9d89491c5604b1611b22f215827f55de98f8ac2
2018-05-24 12:18:14 -07:00
Dongwon Kang
37dc03c468 Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev
am: 1a9def3dc7

Change-Id: I7ebee18631081dbd11dc54227c77d451358b8234
2018-05-24 11:50:00 -07:00
Lajos Molnar
226687cb4d Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev
am: 604064e82d

Change-Id: Id6b79446fb99644b2ce346d58e38f91302d891d1
2018-05-24 11:31:46 -07:00
TreeHugger Robot
0e7a307e14 Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev 2018-05-24 09:59:28 +00:00
Sundong Ahn
d138adfdf6 com.android.media.tv.remoteprovider is built with java_sdk_library
The com.android.media.tv.remoteprovider is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.media.tv.remoteprovider is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.

Bug:77577799
Test: make -j
      make checkapi

Change-Id: If0f33bbdde42d891471cd7d3d295d433a88affec
2018-05-24 16:17:03 +09:00
Daisuke Teranishi
ce4d67b6d0 Use correct filename when adding to ringtone
If the title of the music file includes "/", it's recognized
as a directory separator.
Use correct filename to select the file properly.

Bug: 80202253
Test: Add mp3 which title includes "/" to ringtone

Change-Id: I9bb05f6fe2d7d4dbbdf4f67db7ac6fde04707979
2018-05-24 11:39:33 +09:00
TreeHugger Robot
1a9def3dc7 Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev 2018-05-24 01:59:09 +00:00
Dongwon Kang
4480127cad MediaPlayer: ensure that jni code returns after throwing exceptions.
Test: no crash on getPlaybackParams and pass post media CTS
Bug: 80200877
Change-Id: I7538967962acc2a23062615c0d39720b34505f17
2018-05-23 17:38:35 -07:00
Ajay Panicker
695cc44f56 Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev
am: d8e8126abe

Change-Id: Iefd55728bd7b2a22944de775a2dd24124bfa2bb0
2018-05-23 17:03:07 -07:00
jiabin
ce48867cf9 Merge "Avoid race condition when broadcasting device list changed." into pi-dev
am: 2914820ebf

Change-Id: I60801432a37de495e2b2c9282f8c2bfef17aab4d
2018-05-23 16:07:20 -07:00
Lajos Molnar
832939e690 MediaCodec: make setVideoScalingMode usable for IGBP-based clients
These don't get access to this internal parameter of native window,
yet require it for each buffer.

Bug: 79493409
Change-Id: Ib16e9af58b26c7b66a7e4bb466433fcee7b7d080
2018-05-23 14:59:48 -07:00
Ajay Panicker
d8e8126abe Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev 2018-05-23 18:58:28 +00:00
Wei Jia
100a7a3907 Merge "MediaPlayer: sanity check track before dereferencing" into pi-dev
am: 1ba53717fe

Change-Id: I274167165065a24e49c2b899b33623ffd298b8fa
2018-05-23 11:38:57 -07:00
Marius Renn
3aac10aff9 Merge "Adds support for hardware buffers in ImageWriter Images." into pi-dev
am: f3703f9ef7

Change-Id: Icbbfd9a9690cacc74d9cd70302937532a143ccda
2018-05-23 11:02:59 -07:00
Eric Laurent
3e6fb63090 Add field to set A2DP device volume on connect (1/2)
Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.

Bug: 79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: I909fa3f40818c595fc977695fbfa1214f9a4de72
2018-05-23 17:24:55 +00:00
TreeHugger Robot
2914820ebf Merge "Avoid race condition when broadcasting device list changed." into pi-dev 2018-05-23 15:24:23 +00:00
TreeHugger Robot
1ba53717fe Merge "MediaPlayer: sanity check track before dereferencing" into pi-dev 2018-05-23 02:35:15 +00:00
Marius Renn
f3703f9ef7 Merge "Adds support for hardware buffers in ImageWriter Images." into pi-dev 2018-05-23 01:35:11 +00:00
jiabin
8c3a767b2d Avoid race condition when broadcasting device list changed.
Since broadcastDeviceListChanged could be called in different threads,
there would be race condition causing mutilple callback due to
mPreviousPorts is not thread safe.

Bug: 80138804
Test: run TestDeviceList app in toolbox and cts
Change-Id: I0aa70dc45594bca263ea6f36703f22fe0293f679
2018-05-22 17:56:09 -07:00
Wei Jia
aea5de9410 MediaPlayer: sanity check track before dereferencing
Test: media post submit tests passed
Bug: 78175875
Change-Id: I6a23fc859a077eba03a17a562a7c3bb01d97e85b
2018-05-22 15:26:01 -07:00