Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I1d901692,I3e0bca75

Browse Source 
* changes:
  ControllerLink: Remove unused parameter asSystemService
  MediaController: Remove dispatching key event as system service APIs
This commit is contained in:
TreeHugger Robot
2019-01-30 01:53:50 +00:00
committed by Android (Google) Code Review
parent 4607116f48 da59389fc9
commit 1444690e53
11 changed files with 264 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/policy/PhoneWindow.java
View File

@@ -41,7 +41,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.graphics.Color;
@@ -1885,7 +1884,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// If we have a session send it the volume command, otherwise
// use the suggested stream.
if (mMediaController != null) {
mMediaController.dispatchVolumeButtonEventAsSystemService(event);
getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(
mMediaController.getSessionToken(), event);
} else {
getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(event,
mVolumeControlStreamType);
@@ -1906,7 +1906,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
case KeyEvent.KEYCODE_MEDIA_RECORD:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
if (mMediaController != null) {
if (mMediaController.dispatchMediaButtonEventAsSystemService(event)) {
if (getMediaSessionManager().dispatchMediaKeyEventAsSystemService(
mMediaController.getSessionToken(), event)) {
return true;
}
}
@@ -1977,7 +1978,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// If we have a session send it the volume command, otherwise
// use the suggested stream.
if (mMediaController != null) {
mMediaController.dispatchVolumeButtonEventAsSystemService(event);
getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(
mMediaController.getSessionToken(), event);
} else {
getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(
event, mVolumeControlStreamType);
@@ -2007,7 +2009,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
case KeyEvent.KEYCODE_MEDIA_RECORD:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
if (mMediaController != null) {
if (mMediaController.dispatchMediaButtonEventAsSystemService(event)) {
if (getMediaSessionManager().dispatchMediaKeyEventAsSystemService(
mMediaController.getSessionToken(), event)) {
return true;
}
}