Revert "Fix onPackageChanged handling of disabled packages"

This reverts commit 33139c16611fed10883afe8cae5f03c8a69570b4.

Reason for revert: A CTS test is now flaky, see b/197093424

Change-Id: Ife432938448cc24bb2a61fa30873270bcf2ee1a7

1 files changed, 0 insertions, 69 deletions

diff --git a/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java b/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java
index fc36655bf516..42115d437ee0 100644
--- a/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java
+++ b/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java
@@ -16,10 +16,6 @@
 
 package com.android.server.backup;
 
-import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
-import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
-import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-
 import static com.android.server.backup.testing.TransportData.genericTransport;
 import static com.android.server.backup.testing.TransportTestUtils.mockTransport;
 import static com.android.server.backup.testing.TransportTestUtils.setUpTransportsForTransportManager;
@@ -316,71 +312,6 @@ public class TransportManagerTest {
     }
 
     @Test
-    public void testOnPackageChanged_onPackageChanged_packageDisabledUnregistersTransport()
-            throws Exception {
-        TransportManager transportManager =
-                createTransportManagerWithRegisteredTransports(mTransportA1, mTransportB1);
-        reset(mListener);
-
-        mContext.getPackageManager()
-                .setApplicationEnabledSetting(
-                        PACKAGE_A,
-                        Integer.valueOf(COMPONENT_ENABLED_STATE_DISABLED),
-                        0 /*flags*/);
-        transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A);
-
-        assertRegisteredTransports(transportManager, singletonList(mTransportB1));
-        verify(mListener, never()).onTransportRegistered(any(), any());
-    }
-
-    @Test
-    public void testOnPackageChanged_onPackageChanged_packageEnabledRegistersTransport()
-            throws Exception {
-        TransportManager transportManager =
-                createTransportManagerWithRegisteredTransports(mTransportA1, mTransportB1);
-        reset(mListener);
-
-        mContext.getPackageManager()
-                .setApplicationEnabledSetting(
-                        PACKAGE_A,
-                        Integer.valueOf(COMPONENT_ENABLED_STATE_DISABLED),
-                        0 /*flags*/);
-        transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A);
-
-        assertRegisteredTransports(transportManager, singletonList(mTransportB1));
-        verify(mListener, never()).onTransportRegistered(any(), any());
-
-        mContext.getPackageManager()
-                .setApplicationEnabledSetting(
-                        PACKAGE_A,
-                        Integer.valueOf(COMPONENT_ENABLED_STATE_ENABLED),
-                        0 /*flags*/);
-        transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A);
-
-        assertRegisteredTransports(transportManager, asList(mTransportA1, mTransportB1));
-        verify(mListener)
-                .onTransportRegistered(mTransportA1.transportName, mTransportA1.transportDirName);
-    }
-
-    @Test
-    public void testOnPackageChanged_onPackageChanged_unknownComponentStateIsIgnored()
-            throws Exception {
-        TransportManager transportManager =
-                createTransportManagerWithRegisteredTransports(mTransportA1, mTransportB1);
-        reset(mListener);
-
-        mContext.getPackageManager()
-                .setApplicationEnabledSetting(
-                        PACKAGE_A,
-                        Integer.valueOf(COMPONENT_ENABLED_STATE_DEFAULT),
-                        0 /*flags*/);
-        transportManager.onPackageChanged(PACKAGE_A, PACKAGE_A);
-
-        assertRegisteredTransports(transportManager, asList(mTransportA1, mTransportB1));
-        verify(mListener, never()).onTransportRegistered(any(), any());
-    }
-
-    @Test
     public void testRegisterAndSelectTransport_whenTransportRegistered() throws Exception {
         TransportManager transportManager =
                 createTransportManagerWithRegisteredTransports(null, mTransportA1);