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

2650 Commits

Author SHA1 Message Date
Robert Shih
464da703ca MediaPlayer: added getSelectedTrack 
Change-Id: Ic39b9b3d5e72e13452320a0272deb489a0285913
 2014-07-10 20:32:37 -07:00
Sungsoo Lim
f76ba856f3 Merge "Print a warning message instead of throwing IllegalStateException" 2014-06-17 22:28:18 +00:00
Sungsoo Lim
dc952584e3 Print a warning message instead of throwing IllegalStateException 
In TvInputManager.java, when postSessionReleased() is called but
onSessionReleased() is not called yet, mToken is null, and it's not
an illegal state.

Bug: 15095124
Change-Id: Icd2a84ae350d9979e3cef4dbd3a73699e05e7c2a
 2014-06-17 15:27:57 +09:00
Jae Seo
cf9bec5bb6 TvContract: Enable building programs URI also with channel ID 
Bug: 15446137
Change-Id: I322c1b90c272e553b028af1f9011feecde124915
 2014-06-16 17:55:32 -07:00
RoboErik
2fc02ba031 am 276777ea: b/15676582 Fix ordering of sessions returned by MediaSessionManager 
* commit '276777ea10dadd27cd9fad5260e41dfed6cfa34a':
  b/15676582 Fix ordering of sessions returned by MediaSessionManager
 2014-06-17 00:07:13 +00:00
RoboErik
6b1bea0903 b/15676582 Fix ordering of sessions returned by MediaSessionManager 
This was causing the wrong rcc to be shown. Simple fix
just fixes the ordering so it's not reversed.

Change-Id: I56f2d9d6895d6ba3b0eca8f77a3b0b63e0193ad1
 2014-06-16 16:59:37 -07:00
Marco Nelissen
1c46ae419c Merge "Don't send unneeded messages." 2014-06-16 21:50:51 +00:00
Marco Nelissen
48163e060d Don't send unneeded messages. 
This is significantly faster, and doesn't caused messages to pile
up on a looper that might not be processing them.

Change-Id: I2d3536d1f12c71a214c181523dcd60810de3029d
 2014-06-12 13:22:16 -07:00
RoboErik
430fc48865 Work on removing non-session media routing code 
Change-Id: I73e7d22f2f8772c7b07ccf32d962161d79d5db74
 2014-06-16 14:00:16 -07:00
Chong Zhang
19ed4a179c implement edge styles and underline for closed caption 
Bug: 15470448
Change-Id: I52f6921f85486c05905ac3ae69d2edae9f11667d
 2014-06-16 12:57:35 -07:00
Emily Bernier
c5db4bfb10 Merge "Add an app ops code for microphone muting." 2014-06-14 02:21:10 +00:00
Emily Bernier
22c921a910 Add an app ops code for microphone muting. 
When OP_AUDIO_MICROPHONE (linked to the DISALLOW_UNMUTE_MICROPHONE user
restriction) is set, the system blocks calls to setMicrophoneMute.

Bug: 13585692

Change-Id: Ib32138bcc256cfbac4fe21a090d5ba34f5c641fc
 2014-06-16 11:25:22 -04:00
Chong Zhang
90c91c2adf Merge "support for CEA-608 closed caption" 2014-06-12 17:09:07 +00:00
Chong Zhang
86cdd73d76 Merge "change onData() to take byte array of raw data" 2014-06-12 17:09:07 +00:00
Chong Zhang
bdfd910247 support for CEA-608 closed caption 
Bug: 15470448
Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
 2014-06-11 17:57:23 -07:00
Chong Zhang
079fa9683d change onData() to take byte array of raw data 
conversion to UTF-8 if necessary will be handled by the renderer.

Bug: 15470448
Change-Id: I6d4a5e29e6af07f5c031197ea424f8f8e53cd05b
 2014-06-11 16:35:46 -07:00
Jae Seo
796691e302 Merge "Add an API to get TV input icon" 2014-06-12 03:30:50 +00:00
Jaewan Kim
cca74c1b0d Add an API to get TV input icon 
Bug: 14423022
Change-Id: I7b3c0efadc8448cae56ef370611be8e09a301f42
 2014-06-12 10:36:00 +00:00
RoboErik
b41ed6ca70 am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev 
* commit '8c4b4dc87f68d13331d67f4a25480455a7fb2378':
  b/15330955 Make RemoteController use the new session APIs
 2014-06-12 18:49:02 +00:00
RoboErik
73e23e229d b/15330955 Make RemoteController use the new session APIs 
This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.

Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
 2014-06-11 10:58:52 -07:00
Jae Seo
3a0f19980d Add channel types for NTSC, PAL and SECAM 
Bug: 14451655, Bug: 15321686
Change-Id: I2618fb79a4b20898c95cea22154379738710da44
 2014-06-11 18:25:11 -07:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
Zhijun He
e414608cb3 CamcorderProfiles: Add 4K video constants 
Bug: 15287656
Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
 2014-06-10 22:16:41 +00:00
Jean-Michel Trivi
8a21f5dd79 AudioManager: add ability to allocate a new session ID 
Expose method to allocate a new session ID.
Make the generic error code public.

Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
 2014-06-10 12:44:04 -07:00
RoboErik
e252909394 am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
  Adds listeners for changes to the list of active sessions
 2014-06-09 19:29:58 +00:00
RoboErik
03df2c5153 am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 
* commit '91ead28f8e0d22df8c4eaed4295e8c0e1e21e35f':
  b/15388389 Add volume handling support to MediaRouter
 2014-06-09 19:29:53 +00:00
RoboErik
58af2199a5 am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
  Add a way to get the package/pid of the session
 2014-06-09 19:29:48 +00:00
Jae Seo
8799179638 am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev 
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
 2014-06-09 19:29:28 +00:00
Jae Seo
9aea9c93c5 am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3
 2014-06-09 19:29:17 +00:00
RoboErik
a3d8188556 Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 2014-06-09 19:07:49 +00:00
RoboErik
55f6ab4c81 Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 2014-06-09 19:07:34 +00:00
RoboErik
20685929a4 Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 2014-06-09 19:07:20 +00:00
Jae Seo
085eefd184 Merge "Fix a typo in TvContract" into lmp-preview-dev 2014-06-09 18:43:27 +00:00
Jae Seo
182dc33e9e Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 2014-06-09 18:38:43 +00:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state. 
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
 2014-06-09 14:18:01 -04:00
Jae Seo
f30ea53306 Fix a typo in TvContract 
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.

Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
 2014-06-09 17:50:07 +00:00
Wonsik Kim
32c67ee119 am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev 
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
  Make TvInputs aware of whether it's hardware-based or not
 2014-06-09 17:44:37 +00:00
Dongwon Kang
0a5b778495 am c523b768: Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev 
* commit 'c523b768331f8e3e1d355dd688f47946702cb425':
  Make TvView keep the volume value and set later once the connecation is made.
 2014-06-09 15:55:56 +00:00
Wonsik Kim
55f933f715 Merge "Make TvInputs aware of whether it's hardware-based or not" into lmp-preview-dev 2014-06-09 06:07:21 +00:00
RoboErik
fb442b0384 Add a way to get the package/pid of the session 
We need a package/pid to connect a session to a notification. This
adds a way to get those from the controller of a session.

Change-Id: I7700a341beebd46116dfb7dc82f1a667c718e728
 2014-06-08 13:20:43 -07:00
RoboErik
2e7a9167ae Adds listeners for changes to the list of active sessions 
The listeners get notified when sessions are added, removed, or
reprioritized.

Change-Id: I7f3bfc84049719c3b9c19016c6bac92e1a5c3179
 2014-06-08 12:21:32 -07:00
RoboErik
5d3114b64a b/15388389 Add volume handling support to MediaRouter 
This makes MediaRouter work with sessions to handle volume
requests. Should work with all existing custom volume handling.

Change-Id: I5dfde26a6203a1072b7fc700978b4ca852ebe7d0
 2014-06-08 12:18:25 -07:00
Jae Seo
1bfce9fb9b TIF: Address the feedback from the API review - 3/3 
- Change TvView to be a generic ViewGroup with a single SurfaceView child

Bug: 15345342
Change-Id: I86ed94b7020aabb6e093e391ab9477c1f801919a
 2014-06-08 21:42:39 +09:00
Dongwon Kang
336cdf20dd Make TvView keep the volume value and set later once the connecation is made. 
Bug: 15483740
Change-Id: Id4272bffb556587707b641ec8296bc5a9e57807e
 2014-06-08 18:20:55 +09:00
Wonsik Kim
af743eeaec Make TvInputs aware of whether it's hardware-based or not 
Bug: 15326724
Change-Id: I1f418150ba29ee50afc50a811198115fdc6f9c42
 2014-06-07 13:36:19 +09:00
Dongwon Kang
4ba840f183 am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 
* commit '1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
  TIF: Address the feedback from the API review - 2/3
 2014-06-06 12:36:19 +00:00
Dongwon Kang
929c6912a8 am 77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 
* commit '77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c':
  TIF: Address the feedback from the API review - 1/3
 2014-06-06 12:36:13 +00:00
Dongwon Kang
7012db741c Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 2014-06-06 06:59:17 +00:00
Dongwon Kang
2750d21d8b Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 2014-06-06 06:58:02 +00:00