Loading services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +4 −1 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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; Loading services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java +2 −1 Original line number Diff line number Diff line Loading @@ -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()) { Loading services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java +0 −6 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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; Loading Loading @@ -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; Loading Loading
services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +4 −1 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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; Loading
services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java +2 −1 Original line number Diff line number Diff line Loading @@ -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()) { Loading
services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java +0 −6 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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; Loading Loading @@ -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; Loading