Commit Graph

5970 Commits

Author SHA1 Message Date
Jerry Zhang
18abf57e99 Merge "Add storageId to moveObjects"
am: 1f4f6d2a18

Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e
2017-10-19 18:11:49 +00:00
Jerry Zhang
1f4f6d2a18 Merge "Add storageId to moveObjects" 2017-10-19 17:55:34 +00:00
Tobias Thierer
07efe116b1 Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am: 5f04db96b3

Change-Id: If85216d03022708787a7218e494434453d5548e3
2017-10-19 14:25:12 +00:00
Tobias Thierer
6217e37d30 Framework: Prefer android.system.Os over libcore.io.Libcore.os
This is a pure refactoring with no a behavior change other than
that these calls now go through android.system.Os, which immediately
delegates to Libcore.os.

This is a first step towards separating framework (via
android.system.Os) vs. libcore (via Libcore.os) clients of these
low level APIs. Separating these is a prerequisite towards moving
the API parts of android.system into framework, and moving the
rest into a different package in libcore.

Test: Treehugger
Bug: 67901714

Change-Id: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Merged-In: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
2017-10-18 14:53:57 +01:00
Jerry Zhang
def7b19300 Add storageId to moveObjects
When moving between different storages, the storageId
must be changed as well.

Bug: 67028892
Test: Move between storages with virtual sdcard.
Change-Id: Ie82aa8d53686bfffb7c26b46a49524a00f2f0214
2017-10-17 15:27:03 -07:00
Wonsik Kim
4c2bbbf552 Merge "fix AmrInputStream.read() hang"
am: 5b6a02eb8b

Change-Id: I7aff9043ec95d2f41e5d3301b01707f5dff4bef2
2017-10-03 21:18:10 +00:00
Treehugger Robot
5b6a02eb8b Merge "fix AmrInputStream.read() hang" 2017-10-03 20:37:36 +00:00
Wonsik Kim
e1b8b7bf0f fix AmrInputStream.read() hang
Test: AmrInputStream.read() no longer hangs
Change-Id: I5b3e1c7667891ce250e447c32213511077c5b5df
2017-10-02 17:44:02 -07:00
Jerry Zhang
0f09ac317d Merge "Add moveObject method to change object's path and parent."
am: 33a200e572

Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d
2017-10-03 00:04:03 +00:00
Jerry Zhang
952558d4e5 Add moveObject method to change object's path and parent.
This is needed to implement the MTP MOVE_OBJECT operation.

Bug: 66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f
2017-10-02 11:48:38 -07:00
Marco Nelissen
fa55320f5d Merge "AmrInputStream is not a public API"
am: c3b1442d52

Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb
2017-09-29 20:04:54 +00:00
Marco Nelissen
323d2a56ec AmrInputStream is not a public API
and nobody should be using it. Add some warnings to that effect.

Change-Id: I8029ccd665fd147b4708a68f61c6aa055004a5c1
2017-09-29 10:15:34 -07:00
Ajay Panicker
12bec46613 Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
am: 905d8ab843

Change-Id: I8f47786d4e0c392b008cdce80aed05ca7b1573b1
2017-09-22 17:14:36 +00:00
Ajay Panicker
905d8ab843 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
(cherry picked from commit 6edb68bea6)
2017-09-22 16:31:43 +00:00
bokyung.kim
148414cd2c Merge "Fixed mimetype error of PPT file"
am: 3c28e2b280

Change-Id: I24b9dcf6506c53e26b901f74442f64bb28198611
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
Cindy Kuang
51bc4b6c32 Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2
am: e4f02db258

Change-Id: I14c80bbd8838b6af2010463e9d1fb25cf537a167
2017-08-11 21:20:11 +00:00
Cindy Kuang
e4f02db258 Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am: dc12cb1fb2

Change-Id: Ida5507009926a936ee247c2f43f44b439351d937
2017-08-11 21:06:56 +00:00
Cindy Kuang
2e98cc555e docs: corrected grammar mistake in Class Overview
Test: make ds-docs

Bug: 17533073
Change-Id: Iaf22ad26794e2aac454a736efc746bca6f48eb82
2017-08-09 14:49:19 -07:00
Paul McLean
145c95342c Update isWiredHeadsetOn() to support USB headsets.
Bug: 64250808
Test: Manual from an App (UsbDescriptors app)
Change-Id: Ic979636025e871d69853a7460befce4e1b1a6ed8
2017-08-09 13:07:18 -06:00
Sungsoo Lim
6a2ee3b180 Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev 2017-08-03 00:52:27 +00:00
Sungsoo Lim
09d62021d9 Check CookieHandler in setDataSource with cookies
If the caller of MediaPlayer.setDataSource has installed its own
CookieHandler when cookies are provided, MediaPlayer.setDataSource
requires that the CookieHandler has to be of CookieManager type.

Bug: 63638018
Test: manual
Change-Id: I1539d1fa83440ddfb00cc958cd46b9917fe3a296
2017-08-03 09:48:01 +09:00
Tarandeep Singh
e1cfcf4c4d Fix keyboard focus in VR
Consider this VirtualDisplay (VD) scenario:
HostActivity creates a VD which holds SettingsActivity. When EditText
on SettingsActivity is tapped, it gains focus.
On eventual taps, it loses focus i.e. the Window in VD loses focus and
the host activity in primary display gets the focus instead. This
happens because WM's TaskTapPointerEventListener.onPointerEvent()
is called on the default display only.

Root cause:
1. Tap detector isn't registered for non-default display.
2. Tap detector has no info on which displayId touch was received.
3. InputFlinger doesn't deliver InputMonitor events for
non-default displays (fixed in a separate CL)

Fixing above results in onPointerEvent(MotionEvent) to deliver the
Touch events successfully to VD. We restrict these changes to physical
multi-displays and VR VirtualDisplays (which uses virtual touch device).
[VrManagerService calls WMInternal.setVr2dDisplayId(int)]

In future, displayId should be part of InputEvent. Bug: 64258305

Bug: 62033391
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Change-Id: I3626f4de5aa9bcf905da9abd39f3ab1baefc4c48
2017-08-02 10:46:22 -07:00
Sungsoo
972f27b938 Restore the selected route when an app starts to make sound
Limitation: When two apps make sound simultaneously while one uses a BT
route and the other uses the default route, switching activities between
the two different apps will not change the BT A2DP status until one of
the apps changes its playback status to inactive.

Bug: 32958908, Bug: 35567695, Bug: 33186346
Test: Passed MediaRouter/MediaSession test, and manually varified that
      the b/33186346 is fixed.
Change-Id: I1da97dcb74fa2095425b311ad62cdd00f8118cea
(cherry picked from commit b3658569e9)
2017-07-26 11:02:21 +09:00
TreeHugger Robot
7b3bd1d547 Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev 2017-07-20 00:18:20 +00:00
Sungsoo Lim
9bfb46f6ff Type check before casting from CookieHandler to CookieManager
CookieHandler.getDefault() doesn't always return CookieManager.

Bug: 63638018
Test: pass StreamingMediaPlayerTest#testHlsWithHeadersCookies
Test: manual with a test app
Change-Id: Ie7c19d38f779813f3fffb9abbcb3188a0fca3f45
2017-07-19 18:40:16 +00:00
Sungsoo Lim
59579ce59d MediaRouter: Introduce and use getFallbackRoute method
Instead of selecting default route, select the fallback route to avoid
making sound via the default route while a BT route is available.

Bug: 63582431
Test: manual
Change-Id: I2cb8fbf6c518294fcec2bf14a5d8175c7302396f
2017-07-17 23:21:34 +00:00
Eric Laurent
403bd3429b audioservice: modify default music volume
Default music volume is changed from 3/4 of max to 1/3 of max to
reduce initial volume over headphones percieved as too agressive.

Also add a property ro.config.media_vol_default to modify this
default value.

Bug: 62608451
Test: verify default music volume over headphones after factory reset.
Change-Id: Icadb99e1bafe88984d3a3a05014d4d4648830693
2017-07-11 16:21:44 -07:00
Jean-Michel Trivi
92ed7bf412 AudioService: internal API for disabling audio playback for a UID
Internal API, available through AudioManagerInternal, to flag
  a UID as having lost the ability to play audio. When that
  happens, all players associated with this UID are paused, and
  future players are immediately paused when they report they
  started.
Users of this API must "enable" a previously banned UID when
  it is no longer in use.

Test: upcoming manual test with background apps
Bug: 34471029
Change-Id: Ic1c103aabe8f3897072b3ce938d84cb949540e23
2017-06-27 17:57:34 -07:00
TreeHugger Robot
f05929af73 Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev 2017-06-25 01:26:49 +00:00
TreeHugger Robot
e2e01f7795 Merge "AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL" into oc-dr1-dev 2017-06-24 01:58:38 +00:00
Eric Laurent
5c51bb9919 AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL
Bug: 36220140
Test: verify AUDIO_BECOMING_NOISY intent is broacast when a USB_HEADSET
device is disconnected.

Change-Id: I6bfafc0174d5a02cc64862074f60e073407337d3
2017-06-23 11:08:37 -07:00
Jaewan Kim
74d002be26 Consider double tap of the play/pause as the next track
See following document for the details
https://source.android.com/devices/accessories/headset/usb-headset-spec#control-function-mapping

Bug: 36575213
Test: Run Cts (MediaSessionTest)
Change-Id: I3f9f641a4f6aeb36f03758f05e15bc062cda85f3
2017-06-23 17:19:30 +09:00
Jean-Michel Trivi
f1cd71a3b2 Total Silence vs VoIP
Do not suppress VoIP audio in any DnD mode.

Test: start a VoIP app and enter Total Silence mode, verify comm audio is still heard.
Bug: 37742663
Change-Id: I40de67b45713f476a2e07b05ac84bd6663f50fdf
2017-06-22 19:30:29 -07:00
Jean-Michel Trivi
9a68e9b2ef Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
am: 9f1494368b

Change-Id: Iaa671d4c7008609f0be7430b8f6c35f1021c7586
2017-06-21 17:23:30 +00:00
Jean-Michel Trivi
34bc810b0b Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
am: 9f1494368b

Change-Id: Ic213b2675ee5571449c74b19184da7cb91331c01
2017-06-21 17:23:30 +00:00
Jean-Michel Trivi
7a84eaef3c DnD: Total silence doesn't suppress A11y
When entering Total silence mode, text prompts from a11y were losing
 AppOpsManager.OP_PLAY_AUDIO, causing them to play muted (amplification
 of 0.0f) even though the STREAM_ACCESSIBILITY volume was not.
The fix consists in adding another category of sound suppression
 behavior in AudioAttributes, for usage types that should never be
 suppressed (== muted), and using it for USAGE_ACCESSIBILITY.
 When ZenModeHelper iterates over usages to mute/unmute players,
 consider whether that usage's suppression behavior is SUPPRESSIBLE_NEVER.

Test: turn Talkback on, then enter Total silence and verify Talkback is heard
Bug 62827456

Change-Id: I48cae48797ef9bc6bcaee82484ba078ee445345c
2017-06-20 22:45:14 +00:00
TreeHugger Robot
95b41415cd Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev 2017-06-18 05:15:38 +00:00
Chris Thornton
ba08b7945a Add SoundTriggerManager APIs to use a PendingIntent to get callbacks.
Test: APIs exercised using a special test app not in this CL.

Change-Id: I99425d1e67a778513e6c75e7d595c072032aa2ab
2017-06-13 18:37:48 -07:00
Eric Laurent
eab40d14a8 AudioService: implement safe volume warning for USB Headsets
Also fix MediaRoute update for USB devices

Bug: 62492975
Test: check warning with USB headset and property audio.safemedia.force.

Change-Id: If947beaf81b74b1e560402648042047cb23f1df6
2017-06-09 15:45:45 -07:00
Marco Nelissen
5301c498fe Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c am: 2c1d4f8f7b
am: 031a20a6c7

Change-Id: I5039c6fc8c0a18fcf14edd30f94975fff6c1fc35
2017-06-07 00:31:33 +00:00
Marco Nelissen
031a20a6c7 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c
am: 2c1d4f8f7b

Change-Id: I90250994c72bd9cc54ebb87df3f0f7f510417ef1
2017-06-07 00:24:23 +00:00
Marco Nelissen
2c1d4f8f7b Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8
am: 9e4e6c4b7c

Change-Id: I1d028759fecc34081daf0be653a1b729e0e048ac
2017-06-07 00:16:34 +00:00
Marco Nelissen
db9d2588b8 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3
am: d7fe3ea6a8

Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47
2017-06-07 00:04:12 +00:00
Marco Nelissen
d7fe3ea6a8 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887
am: 4d9e6150f3

Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103
2017-06-06 23:54:55 +00:00
Marco Nelissen
4d9e6150f3 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3
am: ce5c72e887

Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b
2017-06-06 23:45:51 +00:00
Marco Nelissen
ce5c72e887 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113
am: 69b6a382a3

Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0
2017-06-06 23:39:57 +00:00
Marco Nelissen
69b6a382a3 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1
am: e18e8c4113

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
2017-06-06 23:33:50 +00:00
Marco Nelissen
e18e8c4113 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2
am: 3272cf26c1

Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
2017-06-06 23:28:27 +00:00
Marco Nelissen
3272cf26c1 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
am: 6d5bc9a3c2

Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
2017-06-06 23:22:14 +00:00