drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,257 Commits 1 Branch 0 Tags
Commit Graph

5097 Commits

Author SHA1 Message Date
Marco Nelissen
fd91fcc970 Merge "Make AmrInputStream use MediaCodec" am: 866658261f 
am: 618c1a9ae6

Change-Id: Ic6723d4e2ce7ab401908ca955a785463612509bb
 2016-11-11 20:16:00 +00:00
Marco Nelissen
618c1a9ae6 Merge "Make AmrInputStream use MediaCodec" 
am: 866658261f

Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
 2016-11-11 20:10:00 +00:00
Marco Nelissen
01d023e966 Make AmrInputStream use MediaCodec 
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
 2016-11-11 10:53:09 -08:00
Andy Hung
c6e0d5f125 resolve merge conflicts of ffe502b to cw-f-dev 
am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
 2016-10-18 20:11:21 +00:00
Andy Hung
3dd656c624 resolve merge conflicts of ffe502b to cw-f-dev 
Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
 2016-10-18 11:55:04 -07:00
Andy Hung
ffe502bd61 Ringtone: clear the MediaPlayer listener upon completion 
This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.

Bug: 31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff
 2016-10-17 18:12:35 -07:00
Sungsoo
3fc6b8fd0f ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 am: 36f64a2f0c 
am: b68d0855c4

Change-Id: I40df333d3b19911be333e5c466dfe01a3db4bd70
 2016-10-13 22:21:47 +00:00
Sungsoo
b68d0855c4 ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 
am: 36f64a2f0c

Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8
 2016-10-13 22:11:58 +00:00
Sungsoo
36f64a2f0c ExifInterface: Provide backward compatibility am: 2dbe166801 
am: bc813cd510

Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d
 2016-10-13 22:06:01 +00:00
Sungsoo
bc813cd510 ExifInterface: Provide backward compatibility 
am: 2dbe166801

Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535
 2016-10-13 21:57:22 +00:00
Sungsoo
2dbe166801 ExifInterface: Provide backward compatibility 
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Ifb478db3af820eb846c5373d3a284367da3495a0
 2016-10-13 13:06:24 +09: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
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
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 0d33113196e0070829104bf178f3139262b1f33f.

Bug: 28517884, Bug: 31398128
Change-Id: Ida4a3fc1f6f0aae09a5c4463bca8619412f3db58
 2016-09-29 10:15:54 +09: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
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
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
061a018055 MediaExtractor: clarify EOS behavior for local files am: e6b987c569 
am: 7709e7831e

Change-Id: Iaeb510d47505763722ad5ae16e408e1da10cf5a0
 2016-09-15 20:18:51 +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
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
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