11101 Commits

Author SHA1 Message Date
Wei Jia
b5cc0b55e3 Merge "MediaPlayer: add comments of restriction for setNextMediaPlayer." into nyc-mr1-dev 2016-09-16 00:24:16 +00:00
rago
a80bdc38fa Fix scope for visualizer object release
am: 8dc9afa966

Change-Id: Ief46c52c14eddd947f8467d815af05c4ae538f72
2016-09-15 23:29:03 +00:00
Ricardo Garcia
d5a6febfc4 Merge "Fix scope for visualizer object release" into nyc-mr1-dev 2016-09-15 23:22:23 +00:00
Wei Jia
295e727545 MediaPlayer: add comments of restriction for setNextMediaPlayer.
Bug: 31517393
Change-Id: I50d1c6cb45d2544b0dcc8f0a3e7cc5818fcd024e
2016-09-15 14:54:35 -07:00
Robert Shih
061a018055 MediaExtractor: clarify EOS behavior for local files am: e6b987c569
am: 7709e7831e

Change-Id: Iaeb510d47505763722ad5ae16e408e1da10cf5a0
2016-09-15 20:18:51 +00:00
rago
8dc9afa966 Fix scope for visualizer object release
Bug: 30684284
Change-Id: I4170511c6c7f36aa1bce3e439054bc6b8a4a2623
2016-09-15 12:12:27 -07:00
Robert Shih
e6b987c569 MediaExtractor: clarify EOS behavior for local files
Bug: 30726795
Change-Id: Iecd0ceb2bd0e32e0ae3387c534e181a2daf2005b
2016-09-14 23:30:27 +00:00
Jean-Michel Trivi
85bdb72cba MediaScanner: check build fingerprint for system sound scan am: 17d2440090
am: 330249109a

Change-Id: I52040c27bb68d282821db43d48b956e949c9e1de
2016-09-14 22:37:32 +00:00
Jean-Michel Trivi
330249109a MediaScanner: check build fingerprint for system sound scan
am: 17d2440090

Change-Id: Ie3515f40346072f1552f7045bf8d5de02c0b26a9
2016-09-14 22:31:14 +00:00
Jean-Michel Trivi
3fb30a2a43 Merge "MediaScanner: check build fingerprint for system sound scan" into nyc-mr1-dev 2016-09-14 22:23:26 +00:00
Jean-Michel Trivi
17d2440090 MediaScanner: check build fingerprint for system sound scan
Always scan notification, ringtones and alarm files under /system
  when the build fingerprint has changed since the last scan,
  because the dates on those files is not set correctly
  (by design), and hence cannot be trusted in the date-based
  scanning logic.
Remove some dead code

Bug 30476971

Change-Id: I638c787dc177f7f5fb17c1c2a576be190c1c85f9
2016-09-14 12:48:50 -07:00
Jean-Michel Trivi
06a206456a Fix Zen mode for different notification usage types am: e743bda5de
am: 4068a641e6

Change-Id: Ia7956cc38b7a747fed7744016e7b9c5ba0a51530
2016-09-13 01:04:41 +00:00
Jean-Michel Trivi
4068a641e6 Fix Zen mode for different notification usage types
am: e743bda5de

Change-Id: Id5820ab61a8672b7b1a2857c8e6356a11f78be07
2016-09-13 00:50:34 +00:00
Jean-Michel Trivi
156a29f981 Merge "Fix Zen mode for different notification usage types" into nyc-mr1-dev 2016-09-13 00:46:52 +00:00
Eino-Ville Talvala
e93c655093 Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev 2016-09-12 19:20:06 +00:00
Chih-hung Hsieh
da6d274a7d Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c am: d1dd5ae76b
am: 68b9ebcd59

Change-Id: I49a2d607d1d0adfe5a4297a83771336c4cd9c870
2016-09-10 17:26:10 +00:00
Chih-hung Hsieh
68b9ebcd59 Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c
am: d1dd5ae76b

Change-Id: I71778eb5a253ebf5342f863d34e178513d386783
2016-09-10 17:20:37 +00:00
Chih-hung Hsieh
5e91082b3c Merge "Fix google-explicit-constructor warnings in media utils." 2016-09-10 17:07:53 +00:00
Sungsoo
9b2b7cdf83 Disable selecting the default audio route when a BT route is avaiable am: 0d33113196
am: 9c18f58031

Change-Id: Ia97a95e1ffdd113130ccfa2f70f5c02ac407b057
2016-09-10 01:53:43 +00:00
Sungsoo
9c18f58031 Disable selecting the default audio route when a BT route is avaiable
am: 0d33113196

Change-Id: I5ce37239efc8a48f8b14927ca3cc9289f88b84ce
2016-09-10 01:44:26 +00:00
Eric Laurent
38ce20dd0d Merge "Disable selecting the default audio route when a BT route is avaiable" into nyc-mr1-dev 2016-09-10 01:36:48 +00:00
Sungsoo
4c3668d7aa DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am: 56ea7b4901

Change-Id: If8497c9ad514037ce4c1f72dee6f77426d3ecd50
2016-09-09 22:46:55 +00:00
Sungsoo
9a420bb0f6 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am: 56ea7b4901

Change-Id: Iebcfced541a569bd441f45ff126075c2e87401c9
2016-09-09 22:46:46 +00:00
Eino-Ville Talvala
e175aa82b5 DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method
This method (currently @hide) discards all cached buffers for
the ImageReader, which can be useful to free up memory at the
cost of reallocation time if more buffers are needed later.

It has no effect on acquired Images, filled Images waiting to be
acquired, or buffers being actively used by the source rendering to the
Surface.

Bug: 28695173
Change-Id: I427a8ba4ad73a267083f843dbf228bfc53a730d9
2016-09-09 15:11:56 -07:00
Jean-Michel Trivi
e743bda5de Fix Zen mode for different notification usage types
ZenModeHelper was only considering a subset of all notification usage
 types. The code was also iterating over the usage values, expecting
 them to be contiguous, which will break with the addition of new
 usage values.
The update consists in:
 - defining in AudioAttributes an array of expected usage types
 - defining the suppression behavior for each usage type
 - have ZenModeHelper query the behavior for each usage in
    order to apply the corresponding muting behavior.

Bug 29009099

Change-Id: If884dda6297f125c60c5775c757df4f782e22e53
2016-09-09 12:04:11 -07:00
xiaoli.xb.zuo
439e5e49fb Fix memory leak in MediaScannerConnection
This patch adds releasing of MediaScannerConnection in ClientProxy
after disconnecting and releasing of ClientProxy and
IMediaScannerService in disconnection sequence in
MediaScannerConnection.

Bug: 30150344

Change-Id: I1e162e4c9a0b7a741ace20480bcf06f3151a93bf
2016-09-08 09:08:18 -07:00
Sungsoo
56ea7b4901 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.

Bug: 30936376
Change-Id: I115a42601c774062485974042464abb0d65c35e9
(cherry picked from commit a8f9a075b14c526a0de75c2ade81ebc4e05e4ef8)
2016-09-08 08:01:13 +00:00
Sungsoo
0d33113196 Disable selecting the default audio route when a BT route is avaiable
Bug: 28517884
Change-Id: I537db7242adf8adb07f9860a0c43c9eaf40a4229
2016-09-08 15:14:27 +09:00
Chih-hung Hsieh
d835145d2f Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 am: 4836d07980
am: edd824b94a

Change-Id: I83d815f5d739c47407f3faf1b25034e52492d638
2016-08-31 17:40:08 +00:00
Chih-hung Hsieh
edd824b94a Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71
am: 4836d07980

Change-Id: Ib0369e46dd1f1e56b3f660e615bc34c87120acaa
2016-08-31 17:34:11 +00:00
Chih-hung Hsieh
2cace65f71 Merge "Fix google-explicit-constructor warnings in media/mca." 2016-08-31 17:18:29 +00:00
Chih-hung Hsieh
cb98cac6d3 Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76
am: c80db139b3

Change-Id: I6a5f93e80d4ef18286fcb45987b6f9bbd7425f88
2016-08-30 22:50:14 +00:00
Chih-hung Hsieh
c80db139b3 Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c
am: 17f1fc6c76

Change-Id: If968940949e97633e99832a3edc1d3003662dac2
2016-08-30 22:41:26 +00:00
Chih-Hung Hsieh
ae1aadc04f Fix google-explicit-constructor warnings in soundpool.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: Id1183b2929242cdf1fd0a1558d0e70194a1de9bb
2016-08-29 14:53:50 -07:00
Chih-Hung Hsieh
bd42349f7e Fix google-explicit-constructor warnings in media utils.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I13958693f28fae9016124a43cd211e5302ed8d51
2016-08-29 14:49:57 -07:00
Chih-Hung Hsieh
bd6b663b47 Fix google-explicit-constructor warnings in media/mca.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: Ia820e0a82df4bf74e5846917f6148849aed6ddc0
2016-08-29 14:47:52 -07:00
Mark Goldstein
269756de07 docs: Fix typo am: 1c22ae296b
am: 94d4c84f38

Change-Id: Ic95ae48e0ebc693de6114edc2186347deea8145b
2016-08-26 01:02:05 +00:00
Mark Goldstein
94d4c84f38 docs: Fix typo
am: 1c22ae296b

Change-Id: I775b87f43db12889696f015b8fe4051816e6d0fd
2016-08-26 00:47:56 +00:00
Mark Goldstein
60a849ab32 docs: Fix typo am: 1c22ae296b
am: b348093ec4

Change-Id: Ia4e3200d698bf4687b788d31e40dfcb61c3ecd18
2016-08-25 23:56:45 +00:00
Mark Goldstein
b348093ec4 docs: Fix typo
am: 1c22ae296b

Change-Id: I9f7f4389583eedbae2df7554f974d49ebe4b9c1e
2016-08-25 23:48:46 +00:00
Mark Goldstein
1c22ae296b docs: Fix typo
Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7
2016-08-25 12:48:07 -07:00
Sungsoo
77a7787cab ExifInterface: Make saveAttributes throw an exception before change am: a8f9a075b1
am: 6dfc7abaf9

Change-Id: Iecc3f1dcffd540f005312e8a301335ea02cd89b9
2016-08-24 02:31:14 +00:00
Sungsoo
a8f9a075b1 ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.

Bug: 30936376
Change-Id: I115a42601c774062485974042464abb0d65c35e9
2016-08-23 15:22:45 +09:00
Glenn Kasten
d21cb15584 resolve merge conflicts of c76a3ac to stage-aosp-master am: 67ffd5e617
am: f7b4fd24e3

Change-Id: Ib06db403955ae0056c1fee0e09f9249d0b887ea1
2016-08-17 21:10:59 +00:00
Glenn Kasten
f7b4fd24e3 resolve merge conflicts of c76a3ac to stage-aosp-master
am: 67ffd5e617

Change-Id: Ib2d89672efe8757edff320d5ed800b7b0293323b
2016-08-17 21:07:54 +00:00
Glenn Kasten
67ffd5e617 resolve merge conflicts of c76a3ac to stage-aosp-master
Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25
2016-08-17 13:28:04 -07:00
Glenn Kasten
dedb2fd507 Define low latency output stream (formerly primary) am: 2ed8f215f1
am: caea5a683b

Change-Id: I459a9fb99c11cb252232b7192355564d43397f04
2016-08-17 18:25:32 +00:00
Glenn Kasten
caea5a683b Define low latency output stream (formerly primary)
am: 2ed8f215f1

Change-Id: Iaa5978b477d925fe2bacfd31f206dd3380a42f68
2016-08-17 17:35:16 +00:00
Glenn Kasten
1fda533936 Squashed commit of the following:
commit efa6f355b06675aa4d0879fd279e22c16d5c046c
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Wed Aug 10 12:25:13 2016 -0700

    MIDI: Use server-side socket in blocking mode for virtual devices

    Since virtual MIDI servers may misbehave, blocking mode will throttle
    them if clients are not coping with their sending speed.

    Bug: 29413812
    Change-Id: I9c4a2a7a7ea3ea060c93fedc7d0f033427c557c9

commit 755dfb5f83749d3963c63d98d692307f8271c804
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Fri Jul 8 13:26:19 2016 -0700

    Protect MIDI framework against client blocks in MidiReceiver.onSend

    Make the server-side socket non-blocking when creating MidiOutputPort
    for clients. Thus if a client ceases to read from its side of the
    socket pair, the server will just fail to write instead of blocking.

    One drawback is that the MidiOutputPort on the client can't indicate
    that it has become dysfunctional, but it's not possible without
    changing the API.

    Bug: 29413812
    Change-Id: I9dfcbdd214a815cea8fd1365324fd78ca459268a

commit c740b13953761f58233ac651a0b5227733b1bdcc
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Fri Jun 17 04:11:25 2016 -0700

    UsbMidiDevice: Clean up terminology and fix comments

    When working with physical MIDI devices, an *input* stream is used
    for reading from *output* port of the device, and vice versa. Thus,
    using "input" and "output" without specifying whether it's a stream
    or a port is confusing.

    Clarify names of counter variables, and fix a couple of comments
    that were incorrect due to this confusion. No functional changes.

    Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2

commit 4269c6417287737624f6165a8bbeb5aa427de9a0
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu May 5 18:49:16 2016 -0700

    Update MIDI package summary

    Bug: 28625060
    Change-Id: If552ca8e1a0666d402b5f536699bf3fb09c1e324

commit 862d40b73168bde7d0be5280d997985c18061014
Author: Phil Burk <philburk@google.com>
Date:   Tue Apr 19 15:56:24 2016 -0700

    MidiDevice: do not open ports on closed device

    Fix involves client side mIsDeviceClosed flag.

    Bug: 24949216
    Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
    Signed-off-by: Phil Burk <philburk@google.com>

commit 6f1de358b9f2616e03f4655f01454770915ddd66
Author: Phil Burk <philburk@google.com>
Date:   Mon Apr 18 16:05:28 2016 -0700

    MidiService: fix resource leak

    The proxy object was being used to match when adding or removing objects.
    But they are different each time. So now we use an asBinder() object.

    Bug: 28153736
    Change-Id: I1bccebf1e9464668db757ff08b41902d0cf0e3a7
    Signed-off-by: Phil Burk <philburk@google.com>

commit f7386bd535bb8a1d7f8df8f44a1748ab770c991a
Author: Phil Burk <philburk@google.com>
Date:   Tue Apr 5 14:19:53 2016 -0700

    MidiDevice: fix connectPorts for same Process

    If connectPorts() was called for a device in the same process then
    the connection would die when the ParcelFileDescriptor was closed.

    Bug: 26406775
    Change-Id: Id0538452593b4761ac2a93d366ade76d2e35ce73
    Signed-off-by: Phil Burk <philburk@google.com>

Change-Id: I4dfc2a2cbaf04bf1a790ae2cb39bf74fb5bb16ac
2016-08-17 08:45:39 -07:00
Glenn Kasten
46db227b84 Merge "Define low latency output stream (formerly primary)" into nyc-mr1-dev 2016-08-16 22:51:58 +00:00