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

Merge "Prevent extra work on the same timestamp" into qt-dev

Browse Source 
am: 8b42a837cb

Change-Id: Id125546217f2e5e2190e80bfe1a3d9df99fa071a
This commit is contained in:
Alex Salo
2019-05-13 19:06:27 -07:00
committed by android-build-merger
parent 1022068ecb 8b42a837cb
commit b6281e4ca2
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/attention/AttentionManagerService.java
View File

@@ -270,7 +270,7 @@ public class AttentionManagerService extends SystemService {
return; return;
} }
if (!userState.mCurrentAttentionCheck.mCallbackInternal.equals(callbackInternal)) { if (!userState.mCurrentAttentionCheck.mCallbackInternal.equals(callbackInternal)) {
Slog.e(LOG_TAG, "Cannot cancel a non-current request"); Slog.w(LOG_TAG, "Cannot cancel a non-current request");
return; return;
} }
cancel(userState); cancel(userState);

8
services/core/java/com/android/server/power/AttentionDetector.java
View File

@@ -75,6 +75,8 @@ public class AttentionDetector {
*/ */
private final AtomicBoolean mRequested; private final AtomicBoolean mRequested;
private long mLastActedOnNextScreenDimming;
/** /**
* Monotonously increasing ID for the requests sent. * Monotonously increasing ID for the requests sent.
*/ */
@@ -150,6 +152,9 @@ public class AttentionDetector {
} }
public long updateUserActivity(long nextScreenDimming) { public long updateUserActivity(long nextScreenDimming) {
if (nextScreenDimming == mLastActedOnNextScreenDimming) {
return nextScreenDimming;
}
if (!mIsSettingEnabled) { if (!mIsSettingEnabled) {
return nextScreenDimming; return nextScreenDimming;
} }
@@ -190,13 +195,14 @@ public class AttentionDetector {
// afterwards if AttentionManager couldn't deliver it. // afterwards if AttentionManager couldn't deliver it.
mRequested.set(true); mRequested.set(true);
mRequestId++; mRequestId++;
mLastActedOnNextScreenDimming = nextScreenDimming;
mCallback = new AttentionCallbackInternalImpl(mRequestId); mCallback = new AttentionCallbackInternalImpl(mRequestId);
Slog.v(TAG, "Checking user attention, ID: " + mRequestId);
final boolean sent = mAttentionManager.checkAttention(getAttentionTimeout(), mCallback); final boolean sent = mAttentionManager.checkAttention(getAttentionTimeout(), mCallback);
if (!sent) { if (!sent) {
mRequested.set(false); mRequested.set(false);
} }
Slog.v(TAG, "Checking user attention, ID: " + mRequestId);
return whenToCheck; return whenToCheck;
} }

15
services/tests/servicestests/src/com/android/server/power/AttentionDetectorTest.java
View File

@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.atMost;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
@@ -181,11 +182,23 @@ public class AttentionDetectorTest extends AndroidTestCase {
verify(mAttentionManagerInternal, never()).checkAttention(anyLong(), any()); verify(mAttentionManagerInternal, never()).checkAttention(anyLong(), any());
} }
@Test
public void testOnUserActivity_ignoresIfAlreadyDoneForThatNextScreenDimming() {
long when = registerAttention();
verify(mAttentionManagerInternal).checkAttention(anyLong(), any());
assertThat(when).isLessThan(mNextDimming);
clearInvocations(mAttentionManagerInternal);
long redundantWhen = mAttentionDetector.updateUserActivity(mNextDimming);
assertThat(redundantWhen).isEqualTo(mNextDimming);
verify(mAttentionManagerInternal, never()).checkAttention(anyLong(), any());
}
@Test @Test
public void testOnUserActivity_skipsIfAlreadyScheduled() { public void testOnUserActivity_skipsIfAlreadyScheduled() {
registerAttention(); registerAttention();
reset(mAttentionManagerInternal); reset(mAttentionManagerInternal);
long when = mAttentionDetector.updateUserActivity(mNextDimming); long when = mAttentionDetector.updateUserActivity(mNextDimming + 1);
verify(mAttentionManagerInternal, never()).checkAttention(anyLong(), any()); verify(mAttentionManagerInternal, never()).checkAttention(anyLong(), any());
assertThat(when).isLessThan(mNextDimming); assertThat(when).isLessThan(mNextDimming);
} }