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

Commit b9b7a764 authored by William Escande's avatar William Escande
Browse files

AdapterService: getSystemService before initNative 

Use static import to simplify requireNonNull
Use a common method to have a Null check at init and not a crash
later on

Bug: 292141273
Bug: 291815510
Test: atest AdapterServiceTest
Test: atest AdapterServiceRestartTest
Test: atest AdapterServiceFactoryResetTest
Change-Id: I3dc5f697259e5e50a390fe95ba264315e518e251
parent 5e02e78e

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+24 −17
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import static com.android.bluetooth.Utils.hasBluetoothPrivilegedPermission; 
import static com.android.bluetooth.Utils.isDualModeAudioEnabled;

import static com.android.bluetooth.Utils.isPackageNameAccurate;



import static java.util.Objects.requireNonNull;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;
@@ -165,7 +167,6 @@ import java.util.HashSet; 
import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.ConcurrentHashMap;
@@ -597,6 +598,10 @@ public class AdapterService extends Service { 
        }

    }



    final @NonNull <T> T getNonNullSystemService(@NonNull Class<T> clazz) {

        return requireNonNull(getSystemService(clazz), clazz.getSimpleName() + " cannot be null");

    }



    @Override

    @RequiresPermission(

            allOf = {
@@ -618,6 +623,14 @@ public class AdapterService extends Service { 
        initMetricsLogger();

        debugLog("onCreate()");

        mDeviceConfigListener.start();



        mUserManager = getNonNullSystemService(UserManager.class);

        mAppOps = getNonNullSystemService(AppOpsManager.class);

        mAlarmManager = getNonNullSystemService(AlarmManager.class);

        mPowerManager = getNonNullSystemService(PowerManager.class);

        mBatteryStatsManager = getNonNullSystemService(BatteryStatsManager.class);

        mCompanionDeviceManager = getNonNullSystemService(CompanionDeviceManager.class);



        mRemoteDevices = new RemoteDevices(this, mLooper);

        mRemoteDevices.init();

        clearDiscoveringPackages();
@@ -638,7 +651,6 @@ public class AdapterService extends Service { 
                getApplicationContext()

                        .getPackageManager()

                        .hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY);

        mUserManager = getSystemService(UserManager.class);

        initNative(

                mUserManager.isGuestUser(),

                isCommonCriteriaMode(),
@@ -652,20 +664,15 @@ public class AdapterService extends Service { 
        mBluetoothQualityReportReadyCallbacks =

                new RemoteCallbackList<IBluetoothQualityReportReadyCallback>();

        mCallbacks = new RemoteCallbackList<IBluetoothCallback>();

        mAppOps = getSystemService(AppOpsManager.class);

        // Load the name and address

        getAdapterPropertyNative(AbstractionLayer.BT_PROPERTY_BDADDR);

        getAdapterPropertyNative(AbstractionLayer.BT_PROPERTY_BDNAME);

        getAdapterPropertyNative(AbstractionLayer.BT_PROPERTY_CLASS_OF_DEVICE);

        mAlarmManager = getSystemService(AlarmManager.class);

        mPowerManager = getSystemService(PowerManager.class);

        mBatteryStatsManager = getSystemService(BatteryStatsManager.class);

        mCompanionDeviceManager = getSystemService(CompanionDeviceManager.class);



        mBluetoothKeystoreService.initJni();



        mBluetoothQualityReportNativeInterface =

                Objects.requireNonNull(

                requireNonNull(

                        BluetoothQualityReportNativeInterface.getInstance(),

                        "BluetoothQualityReportNativeInterface cannot be null when BQR starts");

        mBluetoothQualityReportNativeInterface.init();
@@ -4956,8 +4963,8 @@ public class AdapterService extends Service { 
            if (!callerIsSystemOrActiveOrManagedUser(service, TAG, "setPreferredAudioProfiles")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            Objects.requireNonNull(device);

            Objects.requireNonNull(modeToProfileBundle);

            requireNonNull(device);

            requireNonNull(modeToProfileBundle);

            if (!BluetoothAdapter.checkBluetoothAddress(device.getAddress())) {

                throw new IllegalArgumentException("device cannot have an invalid address");

            }
@@ -4992,7 +4999,7 @@ public class AdapterService extends Service { 
            if (!callerIsSystemOrActiveOrManagedUser(service, TAG, "getPreferredAudioProfiles")) {

                return Bundle.EMPTY;

            }

            Objects.requireNonNull(device);

            requireNonNull(device);

            if (!BluetoothAdapter.checkBluetoothAddress(device.getAddress())) {

                throw new IllegalArgumentException("device cannot have an invalid address");

            }
@@ -5028,7 +5035,7 @@ public class AdapterService extends Service { 
            if (!callerIsSystem(TAG, "setPreferredAudioProfiles")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            Objects.requireNonNull(device);

            requireNonNull(device);

            if (!BluetoothAdapter.checkBluetoothAddress(device.getAddress())) {

                throw new IllegalArgumentException("device cannot have an invalid address");

            }
@@ -5071,7 +5078,7 @@ public class AdapterService extends Service { 
                    service, TAG, "registerPreferredAudioProfilesChangedCallback")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            Objects.requireNonNull(callback);

            requireNonNull(callback);

            if (!Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {

                return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;

            }
@@ -5115,7 +5122,7 @@ public class AdapterService extends Service { 
                    service, TAG, "unregisterPreferredAudioProfilesChangedCallback")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            Objects.requireNonNull(callback);

            requireNonNull(callback);

            if (!Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {

                return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;

            }
@@ -5159,7 +5166,7 @@ public class AdapterService extends Service { 
                    service, TAG, "registerBluetoothQualityReportReadyCallback")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            Objects.requireNonNull(callback);

            requireNonNull(callback);

            if (!Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {

                return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;

            }
@@ -5197,7 +5204,7 @@ public class AdapterService extends Service { 
                    service, TAG, "unregisterBluetoothQualityReportReadyCallback")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            Objects.requireNonNull(callback);

            requireNonNull(callback);

            if (!Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {

                return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;

            }
@@ -7201,7 +7208,7 @@ public class AdapterService extends Service { 
            };



    private boolean isCommonCriteriaMode() {

        return getSystemService(DevicePolicyManager.class).isCommonCriteriaModeEnabled(null);

        return getNonNullSystemService(DevicePolicyManager.class).isCommonCriteriaModeEnabled(null);

    }



    @SuppressLint("AndroidFrameworkRequiresPermission")

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceFactoryResetTest.java

+53 −43
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.Mockito.*;



import android.app.AlarmManager;

import android.app.AppOpsManager;

import android.app.admin.DevicePolicyManager;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothManager;

import android.bluetooth.IBluetoothCallback;

import android.companion.CompanionDeviceManager;

import android.content.AttributionSource;

import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -108,19 +110,28 @@ public class AdapterServiceFactoryResetTest { 


    private @Mock Context mMockContext;

    private @Mock ApplicationInfo mMockApplicationInfo;

    private @Mock AlarmManager mMockAlarmManager;

    private @Mock Resources mMockResources;

    private @Mock UserManager mMockUserManager;

    private @Mock DevicePolicyManager mMockDevicePolicyManager;

    private @Mock ProfileService mMockGattService;

    private @Mock ProfileService mMockService;

    private @Mock ProfileService mMockService2;

    private @Mock IBluetoothCallback mIBluetoothCallback;

    private @Mock Binder mBinder;

    private @Mock AudioManager mAudioManager;

    private @Mock android.app.Application mApplication;

    private @Mock MetricsLogger mMockMetricsLogger;



    // Mocked SystemService

    private @Mock AlarmManager mMockAlarmManager;

    private @Mock AppOpsManager mMockAppOpsManager;

    private @Mock AudioManager mMockAudioManager;

    private @Mock DevicePolicyManager mMockDevicePolicyManager;

    private @Mock UserManager mMockUserManager;



    // SystemService that are not mocked

    private BluetoothManager mBluetoothManager;

    private CompanionDeviceManager mCompanionDeviceManager;

    private PowerManager mPowerManager;

    private PermissionCheckerManager mPermissionCheckerManager;

    private PermissionManager mPermissionManager;

    // BatteryStatsManager is final and cannot be mocked with regular mockito, so just mock the

    // underlying binder calls.

    final BatteryStatsManager mBatteryStatsManager =
@@ -135,10 +146,6 @@ public class AdapterServiceFactoryResetTest { 
    private final AttributionSource mAttributionSource = new AttributionSource.Builder(

            Process.myUid()).build();



    private BluetoothManager mBluetoothManager;

    private PowerManager mPowerManager;

    private PermissionCheckerManager mPermissionCheckerManager;

    private PermissionManager mPermissionManager;

    private PackageManager mMockPackageManager;

    private MockContentResolver mMockContentResolver;

    private HashMap<String, HashMap<String, String>> mAdapterConfig;
@@ -192,6 +199,11 @@ public class AdapterServiceFactoryResetTest { 
                AdapterServiceTest.getMetricsSalt(adapterConfig));

    }



    <T> void mockGetSystemService(String serviceName, Class<T> serviceClass, T mockService) {

        when(mMockContext.getSystemService(eq(serviceName))).thenReturn(mockService);

        when(mMockContext.getSystemServiceName(eq(serviceClass))).thenReturn(serviceName);

    }



    @Before

    public void setUp() throws PackageManager.NameNotFoundException {

        Log.e(TAG, "setUp()");
@@ -236,8 +248,12 @@ public class AdapterServiceFactoryResetTest { 
        mBluetoothManager = InstrumentationRegistry.getTargetContext()

                .getSystemService(BluetoothManager.class);



        when(mMockContext.getCacheDir()).thenReturn(InstrumentationRegistry.getTargetContext()

                .getCacheDir());

        mCompanionDeviceManager =

                InstrumentationRegistry.getTargetContext()

                        .getSystemService(CompanionDeviceManager.class);



        when(mMockContext.getCacheDir())

                .thenReturn(InstrumentationRegistry.getTargetContext().getCacheDir());

        when(mMockContext.getApplicationInfo()).thenReturn(mMockApplicationInfo);

        when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);

        when(mMockContext.getApplicationContext()).thenReturn(mMockContext);
@@ -246,40 +262,34 @@ public class AdapterServiceFactoryResetTest { 
        when(mMockContext.getResources()).thenReturn(mMockResources);

        when(mMockContext.getUserId()).thenReturn(Process.BLUETOOTH_UID);

        when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager);

        when(mMockContext.getSystemService(Context.USER_SERVICE)).thenReturn(mMockUserManager);

        when(mMockContext.getSystemServiceName(UserManager.class)).thenReturn(Context.USER_SERVICE);

        when(mMockContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(

                mMockDevicePolicyManager);

        when(mMockContext.getSystemServiceName(DevicePolicyManager.class))

                .thenReturn(Context.DEVICE_POLICY_SERVICE);

        when(mMockContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);

        when(mMockContext.getSystemServiceName(PowerManager.class))

                .thenReturn(Context.POWER_SERVICE);

        when(mMockContext.getSystemServiceName(PermissionCheckerManager.class))

                .thenReturn(Context.PERMISSION_CHECKER_SERVICE);

        when(mMockContext.getSystemService(Context.PERMISSION_CHECKER_SERVICE))

                .thenReturn(mPermissionCheckerManager);

        when(mMockContext.getSystemServiceName(PermissionManager.class))

                .thenReturn(Context.PERMISSION_SERVICE);

        when(mMockContext.getSystemService(Context.PERMISSION_SERVICE))

                .thenReturn(mPermissionManager);

        when(mMockContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mMockAlarmManager);

        when(mMockContext.getSystemServiceName(AlarmManager.class))

                .thenReturn(Context.ALARM_SERVICE);

        when(mMockContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);

        when(mMockContext.getSystemServiceName(AudioManager.class))

                .thenReturn(Context.AUDIO_SERVICE);

        when(mMockContext.getSystemService(Context.BATTERY_STATS_SERVICE))

                .thenReturn(mBatteryStatsManager);

        when(mMockContext.getSystemServiceName(BatteryStatsManager.class))

                .thenReturn(Context.BATTERY_STATS_SERVICE);

        when(mMockContext.getSystemService(Context.BLUETOOTH_SERVICE))

                .thenReturn(mBluetoothManager);

        when(mMockContext.getSystemServiceName(BluetoothManager.class))

                .thenReturn(Context.BLUETOOTH_SERVICE);



        mockGetSystemService(Context.ALARM_SERVICE, AlarmManager.class, mMockAlarmManager);

        mockGetSystemService(Context.APP_OPS_SERVICE, AppOpsManager.class, mMockAppOpsManager);

        mockGetSystemService(Context.AUDIO_SERVICE, AudioManager.class, mMockAudioManager);

        mockGetSystemService(

                Context.DEVICE_POLICY_SERVICE, DevicePolicyManager.class, mMockDevicePolicyManager);

        mockGetSystemService(Context.USER_SERVICE, UserManager.class, mMockUserManager);



        mockGetSystemService(

                Context.BATTERY_STATS_SERVICE, BatteryStatsManager.class, mBatteryStatsManager);

        mockGetSystemService(Context.BLUETOOTH_SERVICE, BluetoothManager.class, mBluetoothManager);

        mockGetSystemService(

                Context.COMPANION_DEVICE_SERVICE,

                CompanionDeviceManager.class,

                mCompanionDeviceManager);

        mockGetSystemService(

                Context.PERMISSION_CHECKER_SERVICE,

                PermissionCheckerManager.class,

                mPermissionCheckerManager);

        mockGetSystemService(

                Context.PERMISSION_SERVICE, PermissionManager.class, mPermissionManager);

        mockGetSystemService(Context.POWER_SERVICE, PowerManager.class, mPowerManager);



        when(mMockContext.getSharedPreferences(anyString(), anyInt()))

                .thenReturn(InstrumentationRegistry.getTargetContext()

                        .getSharedPreferences("AdapterServiceTestPrefs", Context.MODE_PRIVATE));

                .thenReturn(

                        InstrumentationRegistry.getTargetContext()

                                .getSharedPreferences(

                                        "AdapterServiceTestPrefs", Context.MODE_PRIVATE));



        when(mMockContext.getAttributionSource()).thenReturn(mAttributionSource);

        doAnswer(invocation -> {

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceRestartTest.java

+47 −39
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.Mockito.*;



import android.app.AlarmManager;

import android.app.AppOpsManager;

import android.app.admin.DevicePolicyManager;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothManager;

import android.bluetooth.IBluetoothCallback;

import android.companion.CompanionDeviceManager;

import android.content.AttributionSource;

import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -103,16 +105,25 @@ public class AdapterServiceRestartTest { 


    private @Mock Context mMockContext;

    private @Mock ApplicationInfo mMockApplicationInfo;

    private @Mock AlarmManager mMockAlarmManager;

    private @Mock Resources mMockResources;

    private @Mock UserManager mMockUserManager;

    private @Mock DevicePolicyManager mMockDevicePolicyManager;

    private @Mock IBluetoothCallback mIBluetoothCallback;

    private @Mock Binder mBinder;

    private @Mock AudioManager mAudioManager;

    private @Mock android.app.Application mApplication;

    private @Mock MetricsLogger mMockMetricsLogger;



    // Mocked SystemService

    private @Mock AlarmManager mMockAlarmManager;

    private @Mock AppOpsManager mMockAppOpsManager;

    private @Mock AudioManager mMockAudioManager;

    private @Mock DevicePolicyManager mMockDevicePolicyManager;

    private @Mock UserManager mMockUserManager;



    // SystemService that are not mocked

    private BluetoothManager mBluetoothManager;

    private CompanionDeviceManager mCompanionDeviceManager;

    private PowerManager mPowerManager;

    private PermissionCheckerManager mPermissionCheckerManager;

    private PermissionManager mPermissionManager;

    // BatteryStatsManager is final and cannot be mocked with regular mockito, so just mock the

    // underlying binder calls.

    final BatteryStatsManager mBatteryStatsManager =
@@ -121,10 +132,6 @@ public class AdapterServiceRestartTest { 
    private final AttributionSource mAttributionSource = new AttributionSource.Builder(

            Process.myUid()).build();



    private BluetoothManager mBluetoothManager;

    private PowerManager mPowerManager;

    private PermissionCheckerManager mPermissionCheckerManager;

    private PermissionManager mPermissionManager;

    private PackageManager mMockPackageManager;

    private MockContentResolver mMockContentResolver;

    private HashMap<String, HashMap<String, String>> mAdapterConfig;
@@ -178,6 +185,11 @@ public class AdapterServiceRestartTest { 
                AdapterServiceTest.getMetricsSalt(adapterConfig));

    }



    <T> void mockGetSystemService(String serviceName, Class<T> serviceClass, T mockService) {

        when(mMockContext.getSystemService(eq(serviceName))).thenReturn(mockService);

        when(mMockContext.getSystemServiceName(eq(serviceClass))).thenReturn(serviceName);

    }



    @Before

    public void setUp() throws PackageManager.NameNotFoundException {

        Log.e(TAG, "setUp()");
@@ -222,6 +234,10 @@ public class AdapterServiceRestartTest { 
        mBluetoothManager = InstrumentationRegistry.getTargetContext()

                .getSystemService(BluetoothManager.class);



        mCompanionDeviceManager =

                InstrumentationRegistry.getTargetContext()

                        .getSystemService(CompanionDeviceManager.class);



        when(mMockContext.getCacheDir()).thenReturn(InstrumentationRegistry.getTargetContext()

                .getCacheDir());

        when(mMockContext.getApplicationInfo()).thenReturn(mMockApplicationInfo);
@@ -232,37 +248,29 @@ public class AdapterServiceRestartTest { 
        when(mMockContext.getResources()).thenReturn(mMockResources);

        when(mMockContext.getUserId()).thenReturn(Process.BLUETOOTH_UID);

        when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager);

        when(mMockContext.getSystemService(Context.USER_SERVICE)).thenReturn(mMockUserManager);

        when(mMockContext.getSystemServiceName(UserManager.class)).thenReturn(Context.USER_SERVICE);

        when(mMockContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(

                mMockDevicePolicyManager);

        when(mMockContext.getSystemServiceName(DevicePolicyManager.class))

                .thenReturn(Context.DEVICE_POLICY_SERVICE);

        when(mMockContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);

        when(mMockContext.getSystemServiceName(PowerManager.class))

                .thenReturn(Context.POWER_SERVICE);

        when(mMockContext.getSystemServiceName(PermissionCheckerManager.class))

                .thenReturn(Context.PERMISSION_CHECKER_SERVICE);

        when(mMockContext.getSystemService(Context.PERMISSION_CHECKER_SERVICE))

                .thenReturn(mPermissionCheckerManager);

        when(mMockContext.getSystemServiceName(PermissionManager.class))

                .thenReturn(Context.PERMISSION_SERVICE);

        when(mMockContext.getSystemService(Context.PERMISSION_SERVICE))

                .thenReturn(mPermissionManager);

        when(mMockContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mMockAlarmManager);

        when(mMockContext.getSystemServiceName(AlarmManager.class))

                .thenReturn(Context.ALARM_SERVICE);

        when(mMockContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);

        when(mMockContext.getSystemServiceName(AudioManager.class))

                .thenReturn(Context.AUDIO_SERVICE);

        when(mMockContext.getSystemService(Context.BATTERY_STATS_SERVICE))

                .thenReturn(mBatteryStatsManager);

        when(mMockContext.getSystemServiceName(BatteryStatsManager.class))

                .thenReturn(Context.BATTERY_STATS_SERVICE);

        when(mMockContext.getSystemService(Context.BLUETOOTH_SERVICE))

                .thenReturn(mBluetoothManager);

        when(mMockContext.getSystemServiceName(BluetoothManager.class))

                .thenReturn(Context.BLUETOOTH_SERVICE);



        mockGetSystemService(Context.ALARM_SERVICE, AlarmManager.class, mMockAlarmManager);

        mockGetSystemService(Context.APP_OPS_SERVICE, AppOpsManager.class, mMockAppOpsManager);

        mockGetSystemService(Context.AUDIO_SERVICE, AudioManager.class, mMockAudioManager);

        mockGetSystemService(

                Context.DEVICE_POLICY_SERVICE, DevicePolicyManager.class, mMockDevicePolicyManager);

        mockGetSystemService(Context.USER_SERVICE, UserManager.class, mMockUserManager);



        mockGetSystemService(

                Context.BATTERY_STATS_SERVICE, BatteryStatsManager.class, mBatteryStatsManager);

        mockGetSystemService(Context.BLUETOOTH_SERVICE, BluetoothManager.class, mBluetoothManager);

        mockGetSystemService(

                Context.COMPANION_DEVICE_SERVICE,

                CompanionDeviceManager.class,

                mCompanionDeviceManager);

        mockGetSystemService(

                Context.PERMISSION_CHECKER_SERVICE,

                PermissionCheckerManager.class,

                mPermissionCheckerManager);

        mockGetSystemService(

                Context.PERMISSION_SERVICE, PermissionManager.class, mPermissionManager);

        mockGetSystemService(Context.POWER_SERVICE, PowerManager.class, mPowerManager);



        when(mMockContext.getSharedPreferences(anyString(), anyInt()))

                .thenReturn(InstrumentationRegistry.getTargetContext()

                        .getSharedPreferences("AdapterServiceTestPrefs", Context.MODE_PRIVATE));

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+47 −48

File changed.

Preview size limit exceeded, changes collapsed.