Sungsoo Lim
bdbec44257
Merge "Track the global setting of BT A2DP on/off" into oc-mr1-dev am: cc2478f90c
...
am: 0047534b7f
2017-09-01 02:13:26 +00:00
Sungsoo Lim
0047534b7f
Merge "Track the global setting of BT A2DP on/off" into oc-mr1-dev
...
am: cc2478f90c
2017-09-01 02:01:58 +00:00
Sungsoo Lim
76512a3d80
Track the global setting of BT A2DP on/off
...
The default phone speaker, bluetooth audio devices, and wired audio
devices are handled as system audio routes. When an app starts to
make sound to a system audio route, the system audio route will be
selected with the following order.
1. The slected route by the app after the latest connection of
an audio device.
2. The lastly connected audio device.
3. The default phone speaker if not connected.
Bug: 64811580
Test: Passed MediaRouterTest, manual
Change-Id: I77badb14596bc661c44237957504164f5476e595
2017-08-31 15:57:56 +09:00
Wonsik Kim
b9e8678d27
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev am: 52700a9795
...
am: 7558ef1b2d
2017-08-31 04:38:11 +00:00
Chong Zhang
c658124d50
Merge "Add heif format to ExifInterface" into oc-mr1-dev am: e034a1f5ed
...
am: 3985765a17
2017-08-31 03:36:24 +00:00
Wonsik Kim
7558ef1b2d
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev
...
am: 52700a9795
2017-08-31 03:13:34 +00:00
Wonsik Kim
e8b4c97bdf
At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread
...
Fixes: 65210445
Fixes: 64915666
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I73f1cebdd4b990e28f8d466f129e781cba2b5bbf
2017-08-31 00:28:36 +00:00
Chong Zhang
3985765a17
Merge "Add heif format to ExifInterface" into oc-mr1-dev
...
am: e034a1f5ed
2017-08-30 23:40:46 +00:00
TreeHugger Robot
e034a1f5ed
Merge "Add heif format to ExifInterface" into oc-mr1-dev
2017-08-30 23:05:12 +00:00
Chong Zhang
6f80587e8b
Add heif format to ExifInterface
...
Get heif dimension and rotation from MediaMetadataRetriever.
Bug: 64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e
2017-08-30 11:33:07 -07:00
Jean-Michel Trivi
47733c46bb
Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev am: 8da5c64628
...
am: 60e09929e7
2017-08-30 01:14:40 +00:00
Jean-Michel Trivi
60e09929e7
Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev
...
am: 8da5c64628
2017-08-29 22:43:19 +00:00
Glenn Kasten
cad0be854d
Merge "Fix Bluetooth typos"
2017-08-29 21:05:57 +00:00
Jean-Michel Trivi
3120059d5b
AudioService: log changes in OP_PLAY_AUDIO
...
Log changes to AppOpsManager.OP_PLAY_AUDIO in live player
Test: "adb shell dumpsys audio" after entering silence mode
Bug: 62258749
Bug: 64286665
Change-Id: Ia1c202c5b8b25e14f7c2e85060a256dc69433909
2017-08-29 11:39:56 -07:00
Jean-Michel Trivi
6a708bcc87
Merge "AudioService: log volume commands and origin" into oc-mr1-dev am: c3fcd65e61
...
am: 0453f8189c
2017-08-29 16:55:51 +00:00
Jean-Michel Trivi
0453f8189c
Merge "AudioService: log volume commands and origin" into oc-mr1-dev
...
am: c3fcd65e61
2017-08-29 16:43:44 +00:00
Jean-Michel Trivi
cf17036a21
AudioService: log volume commands and origin
...
Add volume logger for volume events.
Move AudioService event definitions to separate file.
Test: change volume with volume buttons and dumpsys audio
Bug: 64470715
Change-Id: I25db849bffb4a41a737d226cfc40e2c6f7e0ecc0
2017-08-28 16:26:52 -07:00
bokyung.kim
e2d814e5b6
Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c am: 1190da1b1e
...
am: 54238c6a10
2017-08-28 22:57:54 +00:00
bokyung.kim
54238c6a10
Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c
...
am: 1190da1b1e
2017-08-28 22:47:34 +00:00
bokyung.kim
148414cd2c
Merge "Fixed mimetype error of PPT file"
...
am: 3c28e2b280
2017-08-28 22:27:38 +00:00
bokyung.kim
9806330b52
Fixed mimetype error of PPT file
...
Change mimetype of PPT file to match MS specification.
(MimeUtils.java matched the MS specification)
Test: Check mimetype of DB after saving PPT file.
Change-Id: Ie559499ae39bc527fcc656ba37f28845af209e6c
Signed-off-by: bokyung.kim <bokyung.kim@lge.com >
2017-08-28 13:16:35 -07:00
Ajay Panicker
f4e5177f1f
Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev am: 619503b279
...
am: 8fdd245b7e
2017-08-28 19:51:53 +00:00
TreeHugger Robot
619503b279
Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev
2017-08-28 19:26:41 +00:00
Glenn Kasten
a24e99121a
Fix Bluetooth typos
...
Test: builds OK
Change-Id: Ib5f6a7ac0fe444bd9d64445584668dbdc91f86ce
2017-08-28 11:45:51 -07:00
Jean-Michel Trivi
743cfba7e2
Merge "AudioManager: permission annotations" into oc-mr1-dev am: 72cf1a4fa2
...
am: 3be893e449
2017-08-28 16:47:44 +00:00
Jean-Michel Trivi
26ae15f487
AudioManager: permission annotations
...
Add permission annotations on audio focus @SystemApi methods.
Ignore REQUIRE_PERMISSION error (125) for:
- deprecated abandonAudioFocus() method: the check is on the
request call
- isHdmiSystemAudioSupported() method, it's not clear if it's
being used.
Test: remove "-hide 125" in Android.mk and make, verify no errors\
on AudioManager.java
Bug: 62343127
Change-Id: I62526db0c6dabcc34224c589506d611519de6abc
2017-08-25 19:20:49 -07:00
Jerry Zhang
29b3cfa21d
Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp
...
am: 54c6447f47
2017-08-24 23:10:06 +00:00
Jerry Zhang
4de4655f0d
Merge changes from topic "mtp-user" into oc-mr1-dev
...
* changes:
Add additional context to MtpDatabase
Reset functions to null when user changes.
2017-08-24 22:13:40 +00:00
Jean-Michel Trivi
d2f450bed6
Merge "Audio event logging" into oc-mr1-dev am: 9961d6968e
...
am: 87dfc5bb4e
2017-08-24 19:42:48 +00:00
TreeHugger Robot
9961d6968e
Merge "Audio event logging" into oc-mr1-dev
2017-08-24 19:04:47 +00:00
Ajay Panicker
6edb68bea6
Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
...
Bug: 64686424
Test: Connect to carkit and see that NowPlayingChanged only gets sent when
the queue changes, run cts test
Change-Id: I58c9dd0bf976485a2efefd042cd667ee433e07e1
2017-08-24 17:37:38 +00:00
Jean-Michel Trivi
011f39e7c7
Audio event logging
...
New class AudioEventLogger to store a configurable number of the
last audio events. It hosts a circular buffer of lightweight
event objects, an abstract class whose implementations are
event-specific, and does the heavier string manipulations
at the time of the dump, not during normal operation.
Add logging for:
- phone state (a.k.a. audio mode) changes
- wired device connections
- playback activity monitor
- force use
Test: adb shell dumpsys audio
Bug: 64470715
Change-Id: I8dbd936e2ffec39134f1a8837191c74f5cb9fc56
2017-08-24 09:05:20 -07:00
Jerry Zhang
5f0139d2e8
Add additional context to MtpDatabase
...
MtpService has been changed to a singleton service
running in user 0, so the original context will
be that of user 0. Accesses to MediaProvider and
MediaScanner should use the new passed in user context
in order to access user data, while the broadcast
receiver for battery data will use the original context.
Bug: 64822515
Test: Use Mtp and switch users.
Change-Id: Ic181258337944db7dc6f6097c967cb104df938d3
2017-08-23 11:10:51 -07:00
Yin-Chia Yeh
314bc7be66
Merge "Image: fix typo" into oc-mr1-dev am: ad3a36b13b
...
am: e85bbc5751
2017-08-23 03:20:16 +00:00
TreeHugger Robot
ad3a36b13b
Merge "Image: fix typo" into oc-mr1-dev
2017-08-23 00:20:12 +00:00
Chong Zhang
48fa890b61
heif: add new file and mime types to MediaScanner
...
bug: 64077740
Change-Id: I6d36c2394a5ae527026c98c83786009e70b20958
(cherry picked from commit 6e18ccee2a
2017-08-22 20:00:58 +00:00
Yin-Chia Yeh
43edf1e51d
Image: fix typo
...
Test: none (doc only fix)
Bug: 64648913
Change-Id: I98aa7ac1588e52e8dae0cbbda806159f378110ca
2017-08-21 15:33:38 -07:00
Chong Zhang
6e18ccee2a
heif: add new file and mime types to MediaScanner -- DO NOT MERGE
...
bug: 64077740
Change-Id: I6d36c2394a5ae527026c98c83786009e70b20958
2017-08-19 00:05:06 +00:00
Lajos Molnar
ef65425b8b
Merge "media: handle AVC constrained profiles" into oc-mr1-dev am: 794a8f9dc7
...
am: 1bce851e8b
2017-08-15 06:16:15 +00:00
TreeHugger Robot
251089e509
Merge "TIF: Fix javadoc and add @NonNull to util methods"
2017-08-15 01:27:30 +00:00
Conrad Chen
76750d624a
TIF: Fix javadoc and add @NonNull to util methods
...
Test: javadoc change
Bug: 64330913
Change-Id: I843f10fbdc09008be3d606a470f7c7ceb0d3279f
2017-08-14 16:30:24 -07:00
Lajos Molnar
0aeb1875e4
media: handle AVC constrained profiles
...
Bug: 64691727
Change-Id: I71b21c0951babccc9b4521bd5c26d35a6d62b426
2017-08-14 15:19:52 -07:00
Jeff Sharkey
300befea32
Merge "Someone is still using these APIs." into oc-mr1-dev am: 9bb002ef79
...
am: ad75c81598
2017-08-12 20:05:08 +00:00
Jeff Sharkey
50421b58e5
Someone is still using these APIs.
...
Which is totally lame.
Change-Id: Iaabfc1f5ac69ed99e714e89344bde116c340c376
2017-08-12 18:23:48 +00:00
Jeff Sharkey
b358b9f673
Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev am: c2e09129e0
...
am: b2a9f55488
2017-08-12 03:38:00 +00:00
Jeff Sharkey
c2e09129e0
Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev
2017-08-12 03:21:01 +00:00
Cindy Kuang
451ffa0cf3
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: e4f02db258 am: 51bc4b6c32
...
am: c5f6633fdc
2017-08-11 21:48:21 +00:00
Cindy Kuang
b39042790c
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2
...
am: f125024688
2017-08-11 21:42:58 +00:00
Cindy Kuang
c5f6633fdc
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: e4f02db258
...
am: 51bc4b6c32
2017-08-11 21:33:43 +00:00
Cindy Kuang
51bc4b6c32
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2
...
am: e4f02db258
2017-08-11 21:20:11 +00:00
