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

Protects query pulse reason exception

Browse Source 
Checks the machine is currently in one of the pulse states before
query the current pulse reason. Avoid incorrect undocked event cause
DozeService crash. And refines test case and javadoc.

Bug: 120464108
Test: atest SystemUITests
Test: manual
Change-Id: I3595217984ec7982de1f0f53765e7ae0a9d80fcf
This commit is contained in:
TYM Tsai
2018-12-27 16:46:06 +08:00
parent aef19af34f
commit 2d23690ef4
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/dock/DockManager.java
View File

@@ -22,7 +22,7 @@ package com.android.systemui.dock;
public interface DockManager {
/**
* Uninitialized / unknow dock states
* Uninitialized / unknown dock states
*/
int STATE_NONE = 0;
/**
@@ -37,14 +37,14 @@ public interface DockManager {
/**
* Add a dock event listener into manager
*
* @param callback A {@link #DockEventListener} which want to add
* @param callback A {@link DockEventListener} which want to add
*/
void addListener(DockEventListener callback);
/**
* Remove the added listener from dock manager
*
* @param callback A {@link #DockEventListener} which want to remove
* @param callback A {@link DockEventListener} which want to remove
*/
void removeListener(DockEventListener callback);
@@ -52,8 +52,6 @@ public interface DockManager {
interface DockEventListener {
/**
* Override to handle dock events
*
* Events reference: {@link #DockState}
*/
void onEvent(int event);
}

12
packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java
View File

@@ -86,12 +86,12 @@ public class DozeDockHandler implements DozeMachine.Part {
private void requestPulseOutNow() {
final DozeMachine.State state = mMachine.getState();
final int pulseReason = mMachine.getPulseReason();
if ((state == DozeMachine.State.DOZE_PULSING
|| state == DozeMachine.State.DOZE_REQUEST_PULSE)
&& pulseReason == DozeLog.PULSE_REASON_DOCKING) {
mDozeHost.stopPulsing();
if (state == DozeMachine.State.DOZE_PULSING
|| state == DozeMachine.State.DOZE_REQUEST_PULSE) {
final int pulseReason = mMachine.getPulseReason();
if (pulseReason == DozeLog.PULSE_REASON_DOCKING) {
mDozeHost.stopPulsing();
}
}
}

2
packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java
View File

@@ -119,7 +119,7 @@ public class DozeDockHandlerTest extends SysuiTestCase {
@Test
public void testOnEvent_undockedWhenDoze_neverRequestPulseOut() throws Exception {
mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_PULSING);
when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
mDockManagerFake.setDockEvent(DockManager.STATE_UNDOCKING);