Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,150 Commits 3 Branches 0 Tags
df72e80b03768e94de0d46baea98e6eebd3d4e8d
Commit Graph

4547 Commits

Author SHA1 Message Date
Chien-Yu Chen
ea01d3b80a am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '69421363c6a81a788b963d2f4cb5fdeaa8bd4200':
  ImageWriter: Exception when Surface is abandoned
 2015-07-07 22:29:19 +00:00
Dongwon Kang
a6ec812d07 am 7a64e976: Merge "MediaSessionManager: make the binder implementation static" into mnc-dev 
* commit '7a64e9769f8fe5a400320de9ebd025b0b7af045d':
  MediaSessionManager: make the binder implementation static
 2015-07-07 22:29:12 +00:00
Chien-Yu Chen
69421363c6 Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 2015-07-07 22:16:10 +00:00
Dongwon Kang
7a64e9769f Merge "MediaSessionManager: make the binder implementation static" into mnc-dev 2015-07-07 22:10:23 +00:00
Jeff Tinker
315f501486 am 6826b25c: Merge "Report specific exception type on decrypt with invalid session" into mnc-dev 
* commit '6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5':
  Report specific exception type on decrypt with invalid session
 2015-07-07 21:35:28 +00:00
Jeff Tinker
6826b25c22 Merge "Report specific exception type on decrypt with invalid session" into mnc-dev 2015-07-07 21:19:13 +00:00
Dongwon Kang
d2ed690187 MediaSessionManager: make the binder implementation static 
Removing references to application resources on unregistering so that they
can be GCed as ealry as possible.

Bug: https://code.google.com/p/android/issues/detail?id=161398
Change-Id: Icc083f4a58bb5e738aa662247dc83d021a9dc5c3
 2015-07-07 11:40:51 -07:00
Zhijun He
c52366fb8d am c16cd2ad: am 6c7dc58f: am 1f67e4c8: am 1f52fce6: Merge "ImageUtils: fix image copy issue" into mnc-dev 
* commit 'c16cd2ad66e2a94b300dfe9b81b68352375109d3':
  ImageUtils: fix image copy issue
 2015-07-07 01:58:29 +00:00
Chien-Yu Chen
e0ee63046a ImageWriter: Exception when Surface is abandoned 
Throw IllegalStateException when queueing or dequeueing an
image if the input surface is already abandoned by the consumer.

Also fix a crash when planes are not initialized when closing
ImageWriter.

Bug: 22279111
Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
 2015-07-06 18:26:28 -07:00
Jean-Michel Trivi
6c7e0d4b8f am a95ff42f: am fe1b7ad0: am 87d3d893: am 760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev 
* commit 'a95ff42fbc03f448b08591cd13ef9781fef85c32':
  Ringtone: add support for volume control and looping
 2015-07-07 01:17:39 +00:00
Zhijun He
81ae948b4f am 1f52fce6: Merge "ImageUtils: fix image copy issue" into mnc-dev 
* commit '1f52fce6b9535b0c83e703d0141f2f80a4a2ebfa':
  ImageUtils: fix image copy issue
 2015-07-07 01:16:53 +00:00
Zhijun He
1f52fce6b9 Merge "ImageUtils: fix image copy issue" into mnc-dev 2015-07-07 01:07:17 +00:00
Jean-Michel Trivi
c1b87be50d am 760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev 
* commit '760b1409bc865df5c60f637b8c994eb20888acb8':
  Ringtone: add support for volume control and looping
 2015-07-07 00:32:05 +00:00
Jean-Michel Trivi
760b1409bc Merge "Ringtone: add support for volume control and looping" into mnc-dev 2015-07-06 23:07:26 +00:00
Jeff Tinker
96a2a957e4 Report specific exception type on decrypt with invalid session 
bug: 22235465
Change-Id: Ic1e1a86529d4f2246b9768799aacde5cd1070d04
 2015-07-06 14:35:29 -07:00
Zhijun He
bc0b636679 ImageUtils: fix image copy issue 
Source and destination images may have different alignment requirements,
therefore may have different strides. Copy row by row for such case.

Bug: 21934891
Change-Id: Id53f45f1429d233032fa608f7ab9e2774e88c13b
 2015-07-06 13:48:23 -07:00
Eric Laurent
1e725f8137 audio: add definitions for devices connected over IP 
Bug: 22068684.

Change-Id: I0411679d2852135d4af3016844ced74f7718fa0d
 2015-07-06 12:14:36 -07:00
Jean-Michel Trivi
462045e89a Ringtone: add support for volume control and looping 
Bug 22182606

Change-Id: Ied910b9fe02a5da9c4822a107ee884677c8b4991
 2015-07-06 10:06:02 -07:00
Ronghua Wu
ed6d63d028 am d2868b8d: am e0b71b4e: Merge "media: clean up the usage of max-supported-instances." into mnc-dev 
* commit 'd2868b8dfd46520ceb1e2606e55a5d8e18d11258':
  media: clean up the usage of max-supported-instances.
 2015-07-01 17:11:30 +00:00
Ronghua Wu
e0b71b4ef7 Merge "media: clean up the usage of max-supported-instances." into mnc-dev 2015-07-01 04:00:23 +00:00
Ronghua Wu
71b5a5866d media: clean up the usage of max-supported-instances. 
Bug: 22089269
Change-Id: I05ab49c8b5aaaa0adb6c1a5a1f7af33e6abc5b91
 2015-06-29 17:07:12 -07:00
Jean-Michel Trivi
b20151b496 am c1b30102: am 3a0d77f4: Merge "Volume change intent carries stream alias" into mnc-dev 
* commit 'c1b30102cc7feda09c52d7d857e892ad7ca7eb04':
  Volume change intent carries stream alias
 2015-06-29 22:37:29 +00:00
Jean-Michel Trivi
560877d498 Volume change intent carries stream alias 
Define a new extra, AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, to be
  sent along with the volume change intent, VOLUME_CHANGED_ACTION.
When sending VOLUME_CHANGED_ACTION, attach the stream type alias.

Bug 17955277

Change-Id: I04fd279e223504e3ee1581086d7e9205344a6808
 2015-06-29 10:44:16 -07:00
Eric Laurent
10486c4118 am 2d4f24b1: am 5da8ed16: Merge "AudioManager: optimize audio port listener registration" into mnc-dev 
* commit '2d4f24b14ae8cbc33fd1f0ff70d398fd7727c675':
  AudioManager: optimize audio port listener registration
 2015-06-26 18:01:36 +00:00
Eric Laurent
5da8ed1623 Merge "AudioManager: optimize audio port listener registration" into mnc-dev 2015-06-26 17:43:03 +00:00
Eric Laurent
c573bc5d3d AudioManager: optimize audio port listener registration 
In order to reduce the number of binder calls, only install an
audio port callback in a client process if either:
- an audio port related API has been called once
- an audio port listenr has been registered.

Bug: 22045560.
Change-Id: I0e5cf31bec0c986d6f7761891b860ba6fadd2f4c
 2015-06-26 10:01:12 -07:00
Ronghua Wu
2f73c3c2d9 am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev 
* commit 'af13d3b009c5c39f6d4fa8d54fab724fdea73910':
  media: parse max-concurrent-instances.
 2015-06-25 22:42:00 +00:00
Ronghua Wu
826bf9b63f Merge "media: parse max-concurrent-instances." into mnc-dev 2015-06-25 22:15:06 +00:00
Ronghua Wu
cf6a4ba5a4 media: parse max-concurrent-instances. 
Bug: 22089269
Change-Id: I2b0af7c5c6a309c8396b595ea54b899451239b18
 2015-06-25 14:13:40 -07:00
Narayan Kamath
cd1cdb4653 am 9d01914a: am fdb70dc4: Merge "Fix filedescriptor leakage in MediaMetadataRetriever" 
* commit '9d01914a89bc693e21809fabf46281e638b93f85':
  Fix filedescriptor leakage in MediaMetadataRetriever
 2015-06-25 10:02:15 +00:00
Narayan Kamath
c279a835d5 am 37c68894: am a78c0e0b: Merge "Fixed Javadoc typos" 
* commit '37c688948d4464d636cd64c537b98697cb4b795d':
  Fixed Javadoc typos
 2015-06-25 10:02:08 +00:00
harvey_tsai
e1856e4829 Fix filedescriptor leakage in MediaMetadataRetriever 
setDataSource(String) throws an IllegalArgumentException
when an IOException or FileNotFoundException occurs, but doesn't
close FileDescriptor accordingly.

Change-Id: Ib6e0f1418afeeb19e03abd4bedb4cc845a58b6b4
 2015-06-25 09:31:18 +01:00
Philipp Hasper
802aa0f8a2 Fixed Javadoc typos 
Simple single character typos

Change-Id: I17660dbb3b7ee6597637e8d76770f434ebf202ea
 2015-06-25 08:09:43 +00:00
Jae Seo
1d462aa6f8 Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev 2015-06-23 21:28:00 +00:00
Jae Seo
3612821003 TIF: Add more description to the poster art and thumbnail columns 
Bug: 21971851
Change-Id: Ibffc42060281d1a9fe1bd83b24f33c6ac19d0afa
 2015-06-23 11:27:09 -07:00
Zhijun He
2bfdff4a46 CamcorderProfile: clarify the high speed profile semantics 
Bug: 21442271
Change-Id: I61da855d8f260c5b7ff8a3efd6fab6d6dedd4e2b
 2015-06-23 10:18:31 -07:00
Jae Seo
b1ae00ec62 TIF: Always invalidate the session callback when resetting TvView 
Bug: 20060638
Change-Id: If743eaa025e9bb5bc580d50697f9f20ff9d0fe0a
 2015-06-23 02:53:37 -07:00
Jae Seo
37099a082f Merge "TIF: Minor code improvement" into mnc-dev 2015-06-22 01:18:07 +00:00
Jae Seo
777718220c TIF: Use equals() instead of '==' for String comparisons 
Change-Id: Iea6e3d5f5146e2e3a37c52db5a0a9706540ddb23
 2015-06-21 17:39:02 -07:00
Jae Seo
6e4cbfd2e5 TIF: Minor code improvement 
- Removed unnecessary 'final' keywords for private methods
- Removed unnecessary interface modifiers
- Added a missing ‘final’ keyword
- Simplified if statements
- Removed Javadoc links pointing to itself
- Removed redundant conditional expressions
- Removed unnecessary return statements
- Replaced explicit types with <>
- Removed an unnecessary unboxing
- Removed a redundant initializer
- Fixed typos

Change-Id: I1d137fda70192b33dd00e92ab01396519135ab39
 2015-06-21 17:09:04 -07:00
Jae Seo
a5103b9b52 Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev 2015-06-21 21:27:41 +00:00
Jae Seo
6185858bd9 Merge "TIF: Add COLUMN_SEARCHABLE to TvContract.Programs" into mnc-dev 2015-06-21 20:48:27 +00:00
Jae Seo
99a242c363 Merge "TIF: Always flush pending app-private commands when resetting TvView" into mnc-dev 2015-06-21 20:47:16 +00:00
Jae Seo
40c5c7dcdc TIF: Fix a typo 
Change-Id: Iae3b359369a86224767493149b11d83ba2810ec5
 2015-06-21 00:47:43 -07:00
Jae Seo
4cd54dda7b TIF: Remove unnecessary interface modifiers 
Change-Id: I6b0744b32207bece45bc7ac6bee279b244f8cd3b
 2015-06-21 00:45:04 -07:00
Jae Seo
5ea221b989 TIF: Replace StringBuffer with String 
Change-Id: I52f7d7cc8af7d230d6a23993391f662542886f37
 2015-06-21 00:17:23 -07:00
Jae Seo
1734507286 TIF: Always flush pending app-private commands when resetting TvView 
Bug: 19809952
Change-Id: Ic676b81591def065d79ac45cb1d247b67178e50b
 2015-06-20 23:02:29 -07:00
Jae Seo
546ef567b8 TIF: Add COLUMN_SEARCHABLE to TvContract.Programs 
This allows applications to specify not only channels but also programs
searchable or not enabling finer grained access control.

Bug: 18910284
Change-Id: Id476c37ae8521301c50a4fb2007b41661e74fe89
 2015-06-19 23:47:48 -07:00
Robert Shih
1b98ab3328 Merge "MediaPlayer: documentation for error/info codes." into mnc-dev 2015-06-19 23:49:55 +00:00
Robert Shih
706ebb3ad7 MediaPlayer: documentation for error/info codes. 
Documented in this change:
MEDIA_ERROR_SYSTEM, and
MEDIA_INFO_NETWORK_BANDWIDTH

Bug: 18237764
Change-Id: I0e1efb5813ab0f65133d4119de7562912947c41d
 2015-06-19 16:47:58 -07:00