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

Merge "Fix failure in postsubmit"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-19 09:45:20 +00:00
committed by Android (Google) Code Review
parent 687fb4bcc1 1eac68b121
commit fd33a24650
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java
View File

@@ -43,6 +43,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityWindowInfo;
import android.view.accessibility.IAccessibilityInteractionConnection;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.accessibility.AccessibilitySecurityPolicy.AccessibilityUserManager;
import com.android.server.wm.WindowManagerInternal;
@@ -781,7 +782,9 @@ public class AccessibilityWindowManager {
/**
* Wrapper of accessibility interaction connection for window.
*/
final class RemoteAccessibilityConnection implements IBinder.DeathRecipient {
// In order to avoid using DexmakerShareClassLoaderRule, make this class visible for testing.
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public final class RemoteAccessibilityConnection implements IBinder.DeathRecipient {
private final int mUid;
private final String mPackageName;
private final int mWindowId;

3
services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java
View File

@@ -193,7 +193,8 @@ public class SystemActionPerformer {
/**
* This method returns the list of available system actions.
*/
List<AccessibilityAction> getSystemActions() {
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public List<AccessibilityAction> getSystemActions() {
List<AccessibilityAction> systemActions = new ArrayList<>();
synchronized (mSystemActionLock) {
for (Map.Entry<Integer, RemoteAction> entry : mRegisteredSystemActions.entrySet()) {

6
services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java
View File

@@ -78,7 +78,6 @@ import android.os.PowerManager;
import android.os.Process;
import android.os.RemoteCallback;
import android.os.RemoteException;
import android.testing.DexmakerShareClassLoaderRule;
import android.view.Display;
import android.view.KeyEvent;
import android.view.accessibility.AccessibilityNodeInfo;
@@ -91,7 +90,6 @@ import com.android.server.accessibility.test.MessageCapturingHandler;
import com.android.server.wm.WindowManagerInternal;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
@@ -147,10 +145,6 @@ public class AbstractAccessibilityServiceConnectionTest {
private ArrayList<Integer> mDisplayList = new ArrayList<>(Arrays.asList(
Display.DEFAULT_DISPLAY, SECONDARY_DISPLAY_ID));
// To mock package-private class.
@Rule public final DexmakerShareClassLoaderRule mDexmakerShareClassLoaderRule =
new DexmakerShareClassLoaderRule();
@Mock private Context mMockContext;
@Mock private IPowerManager mMockIPowerManager;
@Mock private PackageManager mMockPackageManager;