Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2177c65 authored by Sally Yuen's avatar Sally Yuen Committed by Android (Google) Code Review
Browse files

Merge "Require CREATE_VIRTUAL_DEVICE permission to register or unregister an... 

Merge "Require CREATE_VIRTUAL_DEVICE permission to register or unregister an AccessibilityDisplayProxy" into udc-dev
parents afd28ce1 9e78be15

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -17290,9 +17290,9 @@ package android.view.accessibility { 
  public final class AccessibilityManager {

    method public int getAccessibilityWindowId(@Nullable android.os.IBinder);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public void performAccessibilityShortcut();

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public boolean registerDisplayProxy(@NonNull android.view.accessibility.AccessibilityDisplayProxy);

    method @RequiresPermission(allOf={android.Manifest.permission.MANAGE_ACCESSIBILITY, android.Manifest.permission.CREATE_VIRTUAL_DEVICE}) public boolean registerDisplayProxy(@NonNull android.view.accessibility.AccessibilityDisplayProxy);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public void registerSystemAction(@NonNull android.app.RemoteAction, int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public boolean unregisterDisplayProxy(@NonNull android.view.accessibility.AccessibilityDisplayProxy);

    method @RequiresPermission(allOf={android.Manifest.permission.MANAGE_ACCESSIBILITY, android.Manifest.permission.CREATE_VIRTUAL_DEVICE}) public boolean unregisterDisplayProxy(@NonNull android.view.accessibility.AccessibilityDisplayProxy);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public void unregisterSystemAction(int);

  }

























core/java/android/view/accessibility/AccessibilityManager.java



+8
−4




























Original line number
Diff line number
Diff line








@@ -2068,12 +2068,14 @@ public final class AccessibilityManager {













     * {@link android.view.Display#INVALID_DISPLAY}, or is already being proxy-ed.















     *















     * @throws SecurityException if the app does not hold the













     * {@link Manifest.permission#MANAGE_ACCESSIBILITY} permission.













     * {@link Manifest.permission#MANAGE_ACCESSIBILITY} permission or the













     * {@link Manifest.permission#CREATE_VIRTUAL_DEVICE} permission.















     *















     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY)













    @RequiresPermission(allOf = {Manifest.permission.MANAGE_ACCESSIBILITY,













            Manifest.permission.CREATE_VIRTUAL_DEVICE})















    public boolean registerDisplayProxy(@NonNull AccessibilityDisplayProxy proxy) {















        final IAccessibilityManager service;















        synchronized (mLock) {









@@ -2096,12 +2098,14 @@ public final class AccessibilityManager {













     * @return {@code true} if the proxy is successfully unregistered.















     *















     * @throws SecurityException if the app does not hold the













     * {@link Manifest.permission#MANAGE_ACCESSIBILITY} permission.













     * {@link Manifest.permission#MANAGE_ACCESSIBILITY} permission or the













     * {@link Manifest.permission#CREATE_VIRTUAL_DEVICE} permission.















     *















     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY)













    @RequiresPermission(allOf = {Manifest.permission.MANAGE_ACCESSIBILITY,













            Manifest.permission.CREATE_VIRTUAL_DEVICE})















    public boolean unregisterDisplayProxy(@NonNull AccessibilityDisplayProxy proxy)  {















        final IAccessibilityManager service;















        synchronized (mLock) {

































services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -3801,6 +3801,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub













    public boolean registerProxyForDisplay(IAccessibilityServiceClient client, int displayId)















            throws RemoteException {















        mSecurityPolicy.enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ACCESSIBILITY);













        mSecurityPolicy.enforceCallingOrSelfPermission(Manifest.permission.CREATE_VIRTUAL_DEVICE);















        if (client == null) {















            return false;















        }










@@ -3837,6 +3838,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub













    @Override















    public boolean unregisterProxyForDisplay(int displayId) {















        mSecurityPolicy.enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ACCESSIBILITY);













        mSecurityPolicy.enforceCallingOrSelfPermission(Manifest.permission.CREATE_VIRTUAL_DEVICE);















        final long identity = Binder.clearCallingIdentity();















        try {















            return mProxyManager.unregisterProxy(displayId);

































services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java



+25
−2




























Original line number
Diff line number
Diff line








@@ -289,7 +289,7 @@ public class AccessibilityManagerServiceTest {





























    @SmallTest















    @Test













    public void testRegisterProxyWithoutPermission() throws Exception {













    public void testRegisterProxyWithoutA11yPermission() throws Exception {















        doThrow(SecurityException.class).when(mMockSecurityPolicy)















                .enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ACCESSIBILITY);

























@@ -299,6 +299,18 @@ public class AccessibilityManagerServiceTest {













                any(), any(), any());















    }





























    @SmallTest













    @Test













    public void testRegisterProxyWithoutDevicePermission() throws Exception {













        doThrow(SecurityException.class).when(mMockSecurityPolicy)













                .enforceCallingOrSelfPermission(Manifest.permission.CREATE_VIRTUAL_DEVICE);



























        assertThrows(SecurityException.class,













                () -> mA11yms.registerProxyForDisplay(mMockServiceClient, TEST_DISPLAY));













        verify(mProxyManager, never()).registerProxy(any(), anyInt(), any(), anyInt(), any(), any(),













                any(), any(), any());













    }





























    @SmallTest















    @Test















    public void testRegisterProxyForDefaultDisplay() throws Exception {










@@ -328,7 +340,7 @@ public class AccessibilityManagerServiceTest {





























    @SmallTest















    @Test













    public void testUnRegisterProxyWithoutPermission() throws Exception {













    public void testUnRegisterProxyWithoutA11yPermission() {















        doThrow(SecurityException.class).when(mMockSecurityPolicy)















                .enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ACCESSIBILITY);

























@@ -337,6 +349,17 @@ public class AccessibilityManagerServiceTest {













        verify(mProxyManager, never()).unregisterProxy(TEST_DISPLAY);















    }





























    @SmallTest













    @Test













    public void testUnRegisterProxyWithoutDevicePermission() {













        doThrow(SecurityException.class).when(mMockSecurityPolicy)













                .enforceCallingOrSelfPermission(Manifest.permission.CREATE_VIRTUAL_DEVICE);



























        assertThrows(SecurityException.class,













                () -> mA11yms.unregisterProxyForDisplay(TEST_DISPLAY));













        verify(mProxyManager, never()).unregisterProxy(TEST_DISPLAY);













    }





























    @SmallTest















    @Test















    public void testOnMagnificationTransitionFailed_capabilitiesIsAll_fallBackToPreviousMode() {