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

9862 Commits

Author SHA1 Message Date
Todd Kennedy
68de157b78 Use RingtonePlayer to get ringtone title 
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.

Bug: 22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
 2015-07-20 17:24:15 -07:00
Jeff Sharkey
4fa85b7cad Better logging of MediaPlayer failure reason. 
Otherwise exception details are dropped on the floor, making it
hard to debug.

Bug: 22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
 2015-07-20 09:38:02 -07:00
Lajos Molnar
e6b407b4be Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 2015-07-17 13:24:27 +00:00
Jae Seo
2ac1fd3c9d TIF: Avoid generating locale dependent input IDs 
Bug: 22519551
Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25
 2015-07-16 17:48:55 -07:00
Lajos Molnar
d08debcf42 MediaSync: fix flush handling and deadlock 
- clear pending video frames
- flush audio track
- reset clock
- restart audio track after flush
- don't hold lock during callback

Bug: 22234976
Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
 2015-07-16 17:09:20 -07:00
Eric Laurent
bd874b8be7 Merge "AudioManager: fix audio device callback list access" into mnc-dev 2015-07-15 01:31:47 +00:00
Eric Laurent
1691f73de5 AudioManager: fix audio device callback list access 
Bug: 22470616.
Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
 2015-07-14 16:27:54 -07:00
Ronghua Wu
148c7c5c17 Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 2015-07-14 15:21:34 +00:00
Kenny Guy
7d170797ac Merge "Mute correct user from device policy manager." into mnc-dev 2015-07-09 10:06:25 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00
Kenny Guy
70e0c58c22 Mute correct user from device policy manager. 
Add per user versions of mute methods so
device policy manager can mute the correct
user.
Just persist change if the calling user
isn't the current user.
Treat calls to audio manager coming from uid
1000 as if they were coming from current user
rather than user 0 so that the correct user's
user restriction is checked.

Bug: 21782066
Bug: 21778905
Change-Id: I51469b741096d8a2ffdc520eaf5b3fd754f2c819
 2015-07-08 19:33:13 +01:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Jeff Sharkey
5af1835d67 Generate stable MTP storage IDs. 
It ends up that MediaProvider is persisting MTP storage IDs in its
database, so we need to make sure we generate stable IDs over time,
otherwise we can end up looking into a black hole.

Bug: 22256092
Change-Id: I6a75c239aac1b71fd5f6df0df69b24971079a086
 2015-07-07 17:46:16 -07:00
Ronghua Wu
75c4824bf6 media: Implement getAchievableFrameRatesFor with measured frame rate. 
Bug: 20507129
Change-Id: I4751ea0f8d4f1173ace18d397b59e9cd6c70688f
 2015-07-07 16:01:53 -07: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
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
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
Zhijun He
1f52fce6b9 Merge "ImageUtils: fix image copy issue" into mnc-dev 2015-07-07 01:07:17 +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
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
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
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
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
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
Jae Seo
81c754a54a TIF: Add the columns for the app-linking to TvContract.Channels 
The app-linking allows channel input sources to provide activity links
from their live channel programming to another activity. This enables
content providers to increase user engagement by offering the viewer
other content or actions.

Bug: 21884742
Change-Id: Iabeea57884c63ac31ee164c27c6e2fe1860f15f6
 2015-06-19 15:04:28 -07:00