Merge "Fix policy issues when screen is off." (fe176252) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManagerPolicy.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -544,16 +544,18 @@ public interface WindowManagerPolicy {
		* Generally, it's best to keep as little as possible in the queue thread
		* because it's the most fragile.
		* @param whenNanos The event time in uptime nanoseconds.
		* @param action The key event action.
		* @param flags The key event flags.
		* @param keyCode The key code.
		* @param down True if the key is down.
		* @param scanCode The key's scan code.
		* @param policyFlags The policy flags associated with the key.
		* @param isScreenOn True if the screen is already on
		*
		* @return The bitwise or of the {@link #ACTION_PASS_TO_USER},
		* {@link #ACTION_POKE_USER_ACTIVITY} and {@link #ACTION_GO_TO_SLEEP} flags.
		*/
		public int interceptKeyBeforeQueueing(long whenNanos, int keyCode, boolean down, int policyFlags,
		boolean isScreenOn);
		public int interceptKeyBeforeQueueing(long whenNanos, int action, int flags,
		int keyCode, int scanCode, int policyFlags, boolean isScreenOn);

		/**
		* Called from the input dispatcher thread before a key is dispatched to a window.
		@@ -571,6 +573,7 @@ public interface WindowManagerPolicy {
		* @param action The key event action.
		* @param flags The key event flags.
		* @param keyCode The key code.
		* @param scanCode The key's scan code.
		* @param metaState bit mask of meta keys that are held.
		* @param repeatCount Number of times a key down has repeated.
		* @param policyFlags The policy flags associated with the key.
		@@ -578,7 +581,7 @@ public interface WindowManagerPolicy {
		* not be further dispatched.
		*/
		public boolean interceptKeyBeforeDispatching(WindowState win, int action, int flags,
		int keyCode, int metaState, int repeatCount, int policyFlags);
		int keyCode, int scanCode, int metaState, int repeatCount, int policyFlags);

		/**
		* Called when layout of the windows is about to start.

core/java/android/widget/MediaController.java

+29 −16

Original line number	Diff line number	Diff line
		@@ -413,33 +413,46 @@ public class MediaController extends FrameLayout {
		@Override
		public boolean dispatchKeyEvent(KeyEvent event) {
		int keyCode = event.getKeyCode();
		if (event.getRepeatCount() == 0 && event.isDown() && (
		keyCode == KeyEvent.KEYCODE_HEADSETHOOK \|\|
		keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE \|\|
		keyCode == KeyEvent.KEYCODE_SPACE)) {
		final boolean uniqueDown = event.getRepeatCount() == 0
		&& event.getAction() == KeyEvent.ACTION_DOWN;
		if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK
		\|\| keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE
		\|\| keyCode == KeyEvent.KEYCODE_SPACE) {
		if (uniqueDown) {
		doPauseResume();
		show(sDefaultTimeout);
		if (mPauseButton != null) {
		mPauseButton.requestFocus();
		}
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP) {
		if (mPlayer.isPlaying()) {
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
		if (uniqueDown && !mPlayer.isPlaying()) {
		mPlayer.start();
		updatePausePlay();
		show(sDefaultTimeout);
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
		\|\| keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {
		if (uniqueDown && mPlayer.isPlaying()) {
		mPlayer.pause();
		updatePausePlay();
		show(sDefaultTimeout);
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN \|\|
		keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
		\|\| keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
		// don't show the controls for volume adjustment
		return super.dispatchKeyEvent(event);
		} else if (keyCode == KeyEvent.KEYCODE_BACK \|\| keyCode == KeyEvent.KEYCODE_MENU) {
		if (uniqueDown) {
		hide();

		}
		return true;
		} else {
		show(sDefaultTimeout);
		}

		show(sDefaultTimeout);
		return super.dispatchKeyEvent(event);
		}

core/java/android/widget/VideoView.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -529,10 +529,19 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
		mMediaController.hide();
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
		if (mMediaPlayer.isPlaying()) {
		start();
		mMediaController.hide();
		}
		return true;
		} else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
		&& mMediaPlayer.isPlaying()) {
		\|\| keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {
		if (!mMediaPlayer.isPlaying()) {
		pause();
		mMediaController.show();
		}
		return true;
		} else {
		toggleMediaControlsVisiblity();
		}

libs/ui/InputDispatcher.cpp

+15 −1

Original line number	Diff line number	Diff line
		@@ -1408,8 +1408,13 @@ String8 InputDispatcher::getApplicationWindowLabelLocked(const InputApplication*

		void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
		int32_t eventType = POWER_MANAGER_BUTTON_EVENT;
		if (eventEntry->type == EventEntry::TYPE_MOTION) {
		switch (eventEntry->type) {
		case EventEntry::TYPE_MOTION: {
		const MotionEntry* motionEntry = static_cast<const MotionEntry*>(eventEntry);
		if (motionEntry->action == AMOTION_EVENT_ACTION_CANCEL) {
		return;
		}

		if (motionEntry->source & AINPUT_SOURCE_CLASS_POINTER) {
		switch (motionEntry->action) {
		case AMOTION_EVENT_ACTION_DOWN:
		@@ -1427,6 +1432,15 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
		break;
		}
		}
		break;
		}
		case EventEntry::TYPE_KEY: {
		const KeyEntry* keyEntry = static_cast<const KeyEntry*>(eventEntry);
		if (keyEntry->flags & AKEY_EVENT_FLAG_CANCELED) {
		return;
		}
		break;
		}
		}

		CommandEntry* commandEntry = postCommandLocked(

policy/src/com/android/internal/policy/impl/KeyguardViewBase.java

+17 −12

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ public abstract class KeyguardViewBase extends FrameLayout {
		case KeyEvent.KEYCODE_MEDIA_PLAY:
		case KeyEvent.KEYCODE_MEDIA_PAUSE:
		case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
		/* Suppress PLAYPAUSE toggle when phone is ringing or
		/* Suppress PLAY/PAUSE toggle when phone is ringing or
		* in-call to avoid music playback */
		if (mTelephonyManager == null) {
		mTelephonyManager = (TelephonyManager) getContext().getSystemService(
		@@ -155,11 +155,13 @@ public abstract class KeyguardViewBase extends FrameLayout {
		mTelephonyManager.getCallState() != TelephonyManager.CALL_STATE_IDLE) {
		return true; // suppress key event
		}
		case KeyEvent.KEYCODE_MUTE:
		case KeyEvent.KEYCODE_HEADSETHOOK:
		case KeyEvent.KEYCODE_MEDIA_STOP:
		case KeyEvent.KEYCODE_MEDIA_NEXT:
		case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
		case KeyEvent.KEYCODE_MEDIA_REWIND:
		case KeyEvent.KEYCODE_MEDIA_RECORD:
		case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
		Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
		intent.putExtra(Intent.EXTRA_KEY_EVENT, event);
		@@ -192,11 +194,14 @@ public abstract class KeyguardViewBase extends FrameLayout {
		switch (keyCode) {
		case KeyEvent.KEYCODE_MUTE:
		case KeyEvent.KEYCODE_HEADSETHOOK:
		case KeyEvent.KEYCODE_MEDIA_PLAY:
		case KeyEvent.KEYCODE_MEDIA_PAUSE:
		case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
		case KeyEvent.KEYCODE_MEDIA_STOP:
		case KeyEvent.KEYCODE_MEDIA_NEXT:
		case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
		case KeyEvent.KEYCODE_MEDIA_REWIND:
		case KeyEvent.KEYCODE_MEDIA_RECORD:
		case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
		Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
		intent.putExtra(Intent.EXTRA_KEY_EVENT, event);