Commit Graph

5418 Commits

Author SHA1 Message Date
Erik Wolsheimer
fdc44dc732 Fix memory leak in Ringtone am: 76ed4ddca0
am: 8d135d53cc

Change-Id: Ieed5a2e27ba53142ceb02a4e6812509beaabb414
2016-10-11 18:31:32 +00:00
Erik Wolsheimer
8d135d53cc Fix memory leak in Ringtone
am: 76ed4ddca0

Change-Id: I7c1167593ba2cc960dbb0b57385c574f5c22f2ad
2016-10-11 18:25:39 +00:00
Erik Wolsheimer
76ed4ddca0 Fix memory leak in Ringtone
BUG: 31938615
Change-Id: Ic736f3494b4da95460bdc0cb7857cc9fcc746ab9
2016-10-11 10:13:23 -07:00
Philip P. Moltmann
7db3055bba Do not access MTP devices when disabled. am: 5201f1e61c
am: c950703424

Change-Id: I9fdf980a9f60ae97eab64019b6f8e7f5b0e67e2b
2016-10-06 20:05:48 +00:00
Hangyu Kuang
6c08cfff6b Merge "media: Unhide mpeg2ts format for streaming output format support." 2016-10-04 17:10:23 +00:00
Mikhail Naganov
1fefc3c75f Merge "MIDI: fix building of properties for the native side" 2016-10-01 01:11:14 +00:00
Philip P. Moltmann
5201f1e61c Do not access MTP devices when disabled.
The USB data transfer is disabled we should not allow access MTP devices
(e.g.
usb sticks). We have two ways of accessing them: Either by mounting them
or by creating a MTPDevice in an app.

Of course an app could implement implement their own MTPDevice
implementation. In this case we cannot enforce the policy without
completely suppressing all MTP USB devices which would be too
restrictive.

Note: When the policy is set we do _not_ disconnect already connected
MTP devices

Fixes: 31472955
Change-Id: I6080c48c49657102774b2b3b4d89ff030245a266
2016-09-30 22:24:23 +00:00
Hangyu Kuang
5b168a0c54 media: Unhide mpeg2ts format for streaming output format support.
Test: Run the camera recorder and output correct mpeg2ts stream.

Bug: 21620607
Change-Id: Ic79758d568e984d55e822d4b6af8716b856dd7da
2016-09-30 13:25:22 -07:00
Mikhail Naganov
33603ae9c5 MIDI: fix building of properties for the native side
A couple of MIDI device's properties (related to ALSA) are of int type
and can't be transferred as a string. Fixed the code.

As we whitelist properties that can go into native, there is no need to
expect other type of properties besides ints and strings.

Bug: 25945784
Change-Id: I008731d0ffee60c31be0bfddb15dcd1425e4b88e
Test: using a PoC app
2016-09-29 17:15:22 -07:00
TreeHugger Robot
a92a8cf905 Merge "[RingtoneManager] Remove user id from internal Uri" 2016-09-29 14:03:36 +00:00
Andre Lago
760d27149d [RingtoneManager] Remove user id from internal Uri
Prevent system ringtones from leaking with user id's on them

Test: manual
Change-Id: Ia4492c75211f9637e075450763f201bf24c5bf03
2016-09-29 13:19:21 +01:00
Sungsoo
909371b6f6 Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39 am: 139f1e3742
am: 220f348fb3

Change-Id: I34ebeddffe313747008ed6f7d941097bd67d7b9b
2016-09-29 11:27:02 +00:00
Sungsoo
69e48e6181 Revert "Disable selecting the default audio route when a BT route is avaiable" am: fa6f70e225 am: 96942eb2ef
am: 727ecf0264

Change-Id: I104fb3405e1841a2120edd546c55b28b85e02550
2016-09-29 11:26:11 +00:00
Sungsoo
220f348fb3 Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39
am: 139f1e3742

Change-Id: I381779ef9ac0d285a35984b3e92948edb7a3fa8e
2016-09-29 11:17:52 +00:00
Sungsoo
727ecf0264 Revert "Disable selecting the default audio route when a BT route is avaiable" am: fa6f70e225
am: 96942eb2ef

Change-Id: Ic6a882104fd7e78886dd0e241a548a94141c653e
2016-09-29 11:17:09 +00:00
Sungsoo
139f1e3742 Make dispatchAudioRoutesChanged be called when BT A2DP status changed
am: 71f3563c39

Change-Id: I1ed4f2bfe61feb150091b16817547538539c3285
2016-09-29 11:04:56 +00:00
Sungsoo
96942eb2ef Revert "Disable selecting the default audio route when a BT route is avaiable"
am: fa6f70e225

Change-Id: Ie3ceb852d7b78eeb7f7492cafbda205f6f313398
2016-09-29 11:04:07 +00:00
TreeHugger Robot
e2782906b5 Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev
* changes:
  Make dispatchAudioRoutesChanged be called when BT A2DP status changed
  Revert "Disable selecting the default audio route when a BT route is avaiable"
2016-09-29 10:54:20 +00:00
Sungsoo
71f3563c39 Make dispatchAudioRoutesChanged be called when BT A2DP status changed
Bug: 28517884, Bug: 31398128
Change-Id: Ic1e2f5e828a772c667caf1408ebfc9b0d7c3f7d4
2016-09-29 10:16:19 +09:00
Sungsoo
fa6f70e225 Revert "Disable selecting the default audio route when a BT route is avaiable"
This reverts commit 0d33113196.

Bug: 28517884, Bug: 31398128
Change-Id: Ida4a3fc1f6f0aae09a5c4463bca8619412f3db58
2016-09-29 10:15:54 +09:00
Sungsoo
e1b15e2117 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034 am: 6e8eba7238
am: 855b9126e1

Change-Id: I4ce94f6368f41dcbf760f164b13c9d6d8055a42b
2016-09-28 00:27:20 +00:00
Sungsoo
4e236046ae ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
am: 0a31d58d14

Change-Id: I33726dd0a1bf2f30309e4abd74b8633c809afada
2016-09-28 00:22:55 +00:00
Sungsoo
855b9126e1 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
am: 6e8eba7238

Change-Id: Ifffb86693778c77a57b2a22387495c0d6cbd1e12
2016-09-28 00:22:53 +00:00
Sungsoo
6e8eba7238 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
am: d0a8a69034

Change-Id: I1d3369e609d668dc402d4b30eb0c4247980e6e47
2016-09-28 00:18:44 +00:00
Sungsoo
0a31d58d14 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
am: d0a8a69034

Change-Id: I4df5b4855ec9f1e38fab504f3a895c4744cc287e
2016-09-28 00:15:51 +00:00
Sungsoo
d0a8a69034 ExifInterface: Update javadoc for saveAttributes
am: abf5b4cbf3

Change-Id: Icdd289f513f2a576b50d0f3ddf278a1c1710d8b5
2016-09-28 00:08:52 +00:00
Sungsoo
abf5b4cbf3 ExifInterface: Update javadoc for saveAttributes
Bug: 31319086
Test: Checked the created javadoc with "make docs"
Change-Id: I97c77ba4f00a95bc5eedf1dcee942aebd2d89ccb
2016-09-27 02:04:35 +00:00
TreeHugger Robot
cea665e36a Merge "Media: check Settings.AUTHORITY without userId" 2016-09-26 15:37:15 +00:00
Robin Lee
9d5b8368d7 Media: check Settings.AUTHORITY without userId
Otherwise we'll miss a trick and not take the settings provider
shortcut for playing work ringtones.

Bug: 30658854
Change-Id: I378cabe0ba426a2c91919b3df33a525d41fe3d0d
2016-09-26 13:49:52 +00:00
Mikhail Naganov
325db121f5 Merge "Make MidiDeviceInfo accessible to native code" 2016-09-22 22:36:08 +00:00
Mikhail Naganov
84b674079d Make MidiDeviceInfo accessible to native code
Update Java serialization code to allow interacting with native
serialization code. One notable change is due to the fact that
properties of non-primitive types can not be read back by native code,
the properties are serialized in two versions: one only contains
properties having primitive types, and another contains all
the properties. The latter is ignored by native code.

Bug: 25945784
Test: using a PoC app
Change-Id: I047a5bdec3006bcbce34c1c63aa7746e01f7a71e
2016-09-22 13:34:19 -07:00
Philip P. Moltmann
71985f5e23 Merge "Do not access MTP devices when disabled." 2016-09-21 18:14:25 +00:00
Eino-Ville Talvala
16177b899b Docs: Note that a Surface acts like a weak reference am: c4faf0cb13 am: ca7f4217b8
am: 0b0b740e6a

Change-Id: I173daca517236a9c912518bf2323b4db9a4cf963
2016-09-17 01:03:05 +00:00
Eino-Ville Talvala
0b0b740e6a Docs: Note that a Surface acts like a weak reference am: c4faf0cb13
am: ca7f4217b8

Change-Id: I42b145bb9139058d2ea349dbb556cd8a2f88724b
2016-09-17 00:47:03 +00:00
Eino-Ville Talvala
c4faf0cb13 Docs: Note that a Surface acts like a weak reference
This causes frequent programming errors, when developers assume
that holding onto a Surface will keep its associated SurfaceTexture,
ImageReader, etc, also alive.

Bug: 31551063
Test: m offline-sdk-docs, manual viewing of result
Change-Id: I5fb5bb3e3c80c7d5d735417b1697e0fe9a62fc46
2016-09-16 22:58:11 +00:00
Wei Jia
a46f4e2cfb MediaPlayer: add comments of restriction for setNextMediaPlayer. am: 295e727545 am: bff3f8a337
am: e9c90cea19

Change-Id: Ief6afe2b76968e14fb124be6316972033634d3a0
2016-09-16 01:55:45 +00:00
Wei Jia
e9c90cea19 MediaPlayer: add comments of restriction for setNextMediaPlayer. am: 295e727545
am: bff3f8a337

Change-Id: I86366b9ac51539ae4000810418b9d3a688231d4e
2016-09-16 01:48:44 +00:00
Wei Jia
bff3f8a337 MediaPlayer: add comments of restriction for setNextMediaPlayer.
am: 295e727545

Change-Id: Ie1fa26a735bfd1167a94796ca379f5b860e959b4
2016-09-16 00:30:13 +00:00
Wei Jia
b5cc0b55e3 Merge "MediaPlayer: add comments of restriction for setNextMediaPlayer." into nyc-mr1-dev 2016-09-16 00:24:16 +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
692bca0628 MediaExtractor: clarify EOS behavior for local files am: e6b987c569 am: 7709e7831e
am: 061a018055

Change-Id: I5e049b0f4e38ee4831f383c4490afb3bac3faecf
2016-09-15 20:24:05 +00: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
Jean-Michel Trivi
14d4f21e02 MediaScanner: check build fingerprint for system sound scan am: 17d2440090 am: 330249109a
am: 85bdb72cba

Change-Id: I31706a0f1abdebab10e9450eb3b2b1469b087701
2016-09-15 11:42:10 +00: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
Philip P. Moltmann
ec3cbb2a66 Do not access MTP devices when disabled.
The USB data transfer is disabled we should not allow access MTP devices (e.g.
usb sticks). We have two ways of accessing them: Either by mounting them
or by creating a MTPDevice in an app.

Of course an app could implement implement their own MTPDevice
implementation. In this case we cannot enforce the policy without
completely suppressing all MTP USB devices which would be too
restrictive.

Note: When the policy is set we do _not_ disconnect already connected
MTP devices

Fixes: 31472955
Change-Id: I6080c48c49657102774b2b3b4d89ff030245a266
2016-09-14 13:29:45 -07: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
d987793bd6 Fix Zen mode for different notification usage types am: e743bda5de am: 4068a641e6
am: 06a206456a

Change-Id: I5a9723affc20cf7a22fcd1e45481d98427acf947
2016-09-14 06:30:54 +00:00