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

9153 Commits

Author SHA1 Message Date
Jean-Michel Trivi
c229c3935c am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 
automerge: 14b9092

* commit '14b909241fe4f43ca481e9cd367dd641fe395ff1':
  Convert record channel mask for dynamic mix
 2014-11-21 02:49:43 +00:00
Jae Seo
9581094970 am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 
automerge: cfaac8d

* commit 'cfaac8d1549430cc89e704602504413a5d59352c':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
 2014-11-21 02:21:15 +00:00
Jae Seo
d97dc701ba am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 
automerge: 7d97be9

* commit '7d97be9dbc8c220fa56e3665deb9b978a12ed71a':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
 2014-11-21 01:59:00 +00:00
RoboErik
24228295e2 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
automerge: bbf0f66

* commit 'bbf0f662a8a54e6c8c49a58b7a7273fe8756ff45':
  Handle volume events on master volume devices correctly
 2014-11-21 01:49:48 +00:00
RoboErik
fdc7f747f2 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
automerge: 216c089

* commit '216c089834e92733055a17bcade7ca1971677b49':
  Scale bitmaps in metadata sent to the system
 2014-11-21 01:48:44 +00:00
Jae Seo
cfaac8d154 am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 
* commit '12c03e3386db46f2452dd7642771adad1d03ce5c':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
 2014-11-21 01:37:51 +00:00
Jae Seo
7d97be9dbc am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 
* commit '91ab2665ed73a37ac9dda52e7d440784b1d1011e':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
 2014-11-21 00:44:27 +00:00
RoboErik
bbf0f662a8 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
* commit '3ef3a9bff37d2fbe216110e025f683923c58ddba':
  Handle volume events on master volume devices correctly
 2014-11-21 00:43:39 +00:00
RoboErik
216c089834 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '50b02d61dca310dc8acaf83d25d919b436f6da43':
  Scale bitmaps in metadata sent to the system
 2014-11-21 00:43:33 +00:00
Lajos Molnar
a4fcb62a22 media: fix isSupportedFormat for integer frame rate 
Bug: 18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
 2014-11-20 16:17:43 -08:00
Jeff Tinker
2670d5ad59 Merge "Fix Crash when sending null in HashMap to getKeyRequest" 2014-11-20 23:29:08 +00:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:19:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Jean-Michel Trivi
09ff91255e Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 2014-11-20 22:02:15 +00:00
Jean-Michel Trivi
8dc1031453 Convert record channel mask for dynamic mix 
When creating the AudioRecord instance for a dynamic mix, convert
  the output channel mask of the mix to an input channel mask
  to be used by the AudioRecord instance through which the
  mixed audio is rerouted.

Bug 16009464

Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
 2014-11-20 12:53:23 -08:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Jae Seo
f66f3052a7 Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 2014-11-20 19:03:03 +00:00
Jae Seo
52bfa3328f Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 2014-11-20 18:52:16 +00:00
Jeff Tinker
5bec026635 Fix Crash when sending null in HashMap to getKeyRequest 
Merge of partner https://android-review.googlesource.com/#/c/115665

Change-Id: I50235dc09be584165155019a70708377ca9688a0
 2014-11-20 18:39:59 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
RoboErik
b9c87fb403 Scale bitmaps in metadata sent to the system 
This scales down any MediaMetadata bitmaps that are sent to the system
through MediaSession.

bug:18114918
bug:18084448
Change-Id: Ib7b040cd8245108ad2dd56afe2499290d2b49f51
 2014-11-19 17:27:43 -08:00
Dongwon Kang
5f3cb4a584 TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView. 
Background: because the hole-punching code lives only in SurfaceView,
the overlay view can be covered by the application if the TV input
changes the position of SurfaceView via Session.layoutSurface().
This change punches a hole as large as TvView so that the underlying
overlayview can be shown properly.

Bug: 18420642
Change-Id: If9a829367083ce2002a4c4a4e4a4bbb623f7ad96
 2014-11-19 20:27:55 +09:00
Eric Laurent
0b03f9909b AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION. 
Bug: 18271714.
Change-Id: I2fa6f44ef991aec5a980d70f698813468e7540c6
 2014-11-18 18:08:02 -08:00
Jae Seo
8923735f28 am e0177a28: am 59f79d9b: am 3a9a53cb: Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev 
* commit 'e0177a28a342bac14edfc4dc502603b886eea193':
  TIF: make the tune request handling more efficient
 2014-11-18 20:21:55 +00:00
John Spurlock
1b9057169e am 3e846cb5: am 313ec49f: am ce66d35f: Merge "Volume: Don\'t allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev 
* commit '3e846cb53c6f6983e5309a4a8d5a1b54a1ac3d7c':
  Volume: Don't allow ringer volume of 0 exiting ringer mode.
 2014-11-18 20:21:45 +00:00
RoboErik
519c7744b5 Handle volume events on master volume devices correctly 
We weren't passing volume events to the master volume correctly on
devices that only use a master volume. This fix checks if the device
only has a master volume and adjusts the master volume instead of the
stream's volume if that's the case.

bug:18305790
Change-Id: Iec35e0a7dc59e6d73c9dfc88da324660bb15b1f3
 2014-11-18 11:00:34 -08:00
Jae Seo
e0177a28a3 am 59f79d9b: am 3a9a53cb: Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev 
* commit '59f79d9b2516abdebc99ce2a673fd4411a745f66':
  TIF: make the tune request handling more efficient
 2014-11-18 18:22:22 +00:00
John Spurlock
3e846cb53c am 313ec49f: am ce66d35f: Merge "Volume: Don\'t allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev 
* commit '313ec49f32c9a387abdae5157b2b75c31173831f':
  Volume: Don't allow ringer volume of 0 exiting ringer mode.
 2014-11-18 18:22:10 +00:00
Jae Seo
3a9a53cb75 Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev 2014-11-18 18:01:47 +00:00
John Spurlock
95ef08b348 Volume: Don't allow ringer volume of 0 exiting ringer mode. 
For any device with vibration, not only voice-capable devices.

Bug: 18423530
Change-Id: I0f1a7df884d675e6bc6854dcf044426c07f3d2f7
 2014-11-18 10:51:39 -05:00
Dongwon Kang
c918172508 TIF: make the tune request handling more efficient 
- Clear the pending tune operations to handle consecutive tune requests
  efficiently.
- Add time out for onTune() to make developers not to handle whole tune
  process in the onTune() method.

Bug: 18179595
Change-Id: I571e55b78d7c4d17c7237c5ce70203941bec2130
 2014-11-18 15:49:08 +09:00
Marco Nelissen
e726680652 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:54 +00:00
Marco Nelissen
97069dd4fd Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:05:31 -08:00
Marco Nelissen
dce97407dc Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5
 2014-11-14 14:02:09 -08:00
Jeff Sharkey
afc506c54b am 670cf5c6: am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '670cf5c663f4f17faafa9d4f7cf7209f68a02468':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 19:16:38 +00:00
Jean-Michel Trivi
f46501680d am 3c922dd7: am 84c803f8: am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev 
* commit '3c922dd7f2c82ae09c5ccf5a7b3a338ef682fe65':
  Support for delayed audio focus
 2014-11-14 00:45:45 +00:00
Mike Lockwood
3733efc8c1 am b8cb45fd: am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit 'b8cb45fddf5618ca0e8e9b36368a729785599e7c':
  MTP: Update JNI for new packet getters
 2014-11-14 00:44:51 +00:00
Jeff Sharkey
670cf5c663 am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '22c3f90639fa8d74de68a63b0a13412740580845':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 00:02:58 +00:00
Jeff Sharkey
628d2606f7 Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 2014-11-13 22:16:15 +00:00
Jeff Sharkey
3b566b8470 Move ringtone redirection to MediaPlayer. 
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.

With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.

To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.

Bug: 18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
 2014-11-13 13:52:41 -08:00
Jean-Michel Trivi
3c922dd7f2 am 84c803f8: am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev 
* commit '84c803f85db1117e1a31e74aa46f9089a3b54cf5':
  Support for delayed audio focus
 2014-11-13 19:03:43 +00:00
Jean-Michel Trivi
136f54153e Merge "Support for delayed audio focus" into lmp-mr1-dev 2014-11-13 18:47:34 +00:00
Mike Lockwood
b8cb45fddf am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit '0181664081db2149aa465332c33c5cb413a4348c':
  MTP: Update JNI for new packet getters
 2014-11-13 18:01:55 +00:00
Mike Lockwood
9c803fa526 MTP: Update JNI for new packet getters 
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
 2014-11-13 09:40:42 -08:00
Dan Albert
45670c1dc5 am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
  Move frameworks/base over to libc++.
 2014-11-12 21:31:33 +00:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
 2014-11-12 13:24:42 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08:00
Wonsik Kim
90e733385d TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs() 
Bug: 18283466
Change-Id: Ibb5d45c02a327e0b3e837ad3ec3603fa1623ff7b
 2014-11-12 05:45:03 +00:00
Jean-Michel Trivi
fd6ad747e6 Support for delayed audio focus 
New internal API for an audio focus requester to always enter
 the audio focus stack even if audio focus can't be granted
 immediately (e.g. during a phone call).
Remap the "no delay" interface to the new "requestAudioFocus"
 method signature and AIDL.

Bug 16010554

Change-Id: Iff91ddb0beb411cca1f8cf98300a9afc4178dc7f
 2014-11-11 17:07:45 -08:00
Chong Zhang
bc0636e560 am 7b1c33f7: am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev automerge: 6610985 
* commit '7b1c33f7a498b954d4c098e9f1a367b2be395d83':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:55:35 +00:00