diff options
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/ProxyManager.java | 72 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java | 7 |
2 files changed, 28 insertions, 51 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/ProxyManager.java b/services/accessibility/java/com/android/server/accessibility/ProxyManager.java index da11a76d5282..f8551457d04d 100644 --- a/services/accessibility/java/com/android/server/accessibility/ProxyManager.java +++ b/services/accessibility/java/com/android/server/accessibility/ProxyManager.java @@ -183,14 +183,12 @@ public class ProxyManager { synchronized (mLock) { mProxyA11yServiceConnections.put(displayId, connection); - if (Flags.proxyUseAppsOnVirtualDeviceListener()) { - if (mAppsOnVirtualDeviceListener == null) { - mAppsOnVirtualDeviceListener = allRunningUids -> - notifyProxyOfRunningAppsChange(allRunningUids); - final VirtualDeviceManagerInternal localVdm = getLocalVdm(); - if (localVdm != null) { - localVdm.registerAppsOnVirtualDeviceListener(mAppsOnVirtualDeviceListener); - } + if (mAppsOnVirtualDeviceListener == null) { + mAppsOnVirtualDeviceListener = allRunningUids -> + notifyProxyOfRunningAppsChange(allRunningUids); + final VirtualDeviceManagerInternal localVdm = getLocalVdm(); + if (localVdm != null) { + localVdm.registerAppsOnVirtualDeviceListener(mAppsOnVirtualDeviceListener); } } if (mProxyA11yServiceConnections.size() == 1) { @@ -331,14 +329,12 @@ public class ProxyManager { // device. if (!isProxyedDeviceId(deviceId)) { synchronized (mLock) { - if (Flags.proxyUseAppsOnVirtualDeviceListener()) { - if (mProxyA11yServiceConnections.size() == 0) { - final VirtualDeviceManagerInternal localVdm = getLocalVdm(); - if (localVdm != null && mAppsOnVirtualDeviceListener != null) { - localVdm.unregisterAppsOnVirtualDeviceListener( - mAppsOnVirtualDeviceListener); - mAppsOnVirtualDeviceListener = null; - } + if (mProxyA11yServiceConnections.size() == 0) { + final VirtualDeviceManagerInternal localVdm = getLocalVdm(); + if (localVdm != null && mAppsOnVirtualDeviceListener != null) { + localVdm.unregisterAppsOnVirtualDeviceListener( + mAppsOnVirtualDeviceListener); + mAppsOnVirtualDeviceListener = null; } } mSystemSupport.removeDeviceIdLocked(deviceId); @@ -671,8 +667,7 @@ public class ProxyManager { + getLastSentStateLocked(deviceId)); Slog.v(LOG_TAG, "force update: " + forceUpdate); } - if ((getLastSentStateLocked(deviceId)) != proxyState - || (Flags.proxyUseAppsOnVirtualDeviceListener() && forceUpdate)) { + if ((getLastSentStateLocked(deviceId)) != proxyState || forceUpdate) { setLastStateLocked(deviceId, proxyState); mMainHandler.post(() -> { synchronized (mLock) { @@ -873,33 +868,22 @@ public class ProxyManager { for (int i = 0; i < clients.getRegisteredCallbackCount(); i++) { final AccessibilityManagerService.Client client = ((AccessibilityManagerService.Client) clients.getRegisteredCallbackCookie(i)); - if (Flags.proxyUseAppsOnVirtualDeviceListener()) { - if (deviceId == DEVICE_ID_DEFAULT || deviceId == DEVICE_ID_INVALID) { - continue; - } - boolean uidBelongsToDevice = - localVdm.getDeviceIdsForUid(client.mUid).contains(deviceId); - if (client.mDeviceId != deviceId && uidBelongsToDevice) { - if (DEBUG) { - Slog.v(LOG_TAG, "Packages moved to device id " + deviceId + " are " - + Arrays.toString(client.mPackageNames)); - } - client.mDeviceId = deviceId; - } else if (client.mDeviceId == deviceId && !uidBelongsToDevice) { - client.mDeviceId = DEVICE_ID_DEFAULT; - if (DEBUG) { - Slog.v(LOG_TAG, "Packages moved to the default device from device id " - + deviceId + " are " + Arrays.toString(client.mPackageNames)); - } + if (deviceId == DEVICE_ID_DEFAULT || deviceId == DEVICE_ID_INVALID) { + continue; + } + boolean uidBelongsToDevice = + localVdm.getDeviceIdsForUid(client.mUid).contains(deviceId); + if (client.mDeviceId != deviceId && uidBelongsToDevice) { + if (DEBUG) { + Slog.v(LOG_TAG, "Packages moved to device id " + deviceId + " are " + + Arrays.toString(client.mPackageNames)); } - } else { - if (deviceId != DEVICE_ID_DEFAULT && deviceId != DEVICE_ID_INVALID - && localVdm.getDeviceIdsForUid(client.mUid).contains(deviceId)) { - if (DEBUG) { - Slog.v(LOG_TAG, "Packages moved to device id " + deviceId + " are " - + Arrays.toString(client.mPackageNames)); - } - client.mDeviceId = deviceId; + client.mDeviceId = deviceId; + } else if (client.mDeviceId == deviceId && !uidBelongsToDevice) { + client.mDeviceId = DEVICE_ID_DEFAULT; + if (DEBUG) { + Slog.v(LOG_TAG, "Packages moved to the default device from device id " + + deviceId + " are " + Arrays.toString(client.mPackageNames)); } } } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java index 52b33db556e6..f371823473ef 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java @@ -51,9 +51,6 @@ import android.os.IBinder; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.os.test.FakePermissionEnforcer; -import android.platform.test.annotations.RequiresFlagsEnabled; -import android.platform.test.flag.junit.CheckFlagsRule; -import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.platform.test.flag.junit.SetFlagsRule; import android.util.ArraySet; import android.view.KeyEvent; @@ -98,9 +95,6 @@ public class ProxyManagerTest { private static final int STREAMED_CALLING_UID = 9876; @Rule - public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); - - @Rule public SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @Mock private Context mMockContext; @@ -243,7 +237,6 @@ public class ProxyManagerTest { * app changes to the proxy device. */ @Test - @RequiresFlagsEnabled(Flags.FLAG_PROXY_USE_APPS_ON_VIRTUAL_DEVICE_LISTENER) public void testUpdateProxyOfRunningAppsChange_changedUidIsStreamedApp_propagatesChange() { final VirtualDeviceManagerInternal localVdm = Mockito.mock(VirtualDeviceManagerInternal.class); |