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

Commit 32fd48ac authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify factoryReset 

Bug: 145171640
Test: compile & run
Change-Id: I85000456b282bb19b003db77f3c363f10269cbe5
parent 728fe22d

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

+4 −9
Original line number Diff line number Diff line
@@ -1884,8 +1884,10 @@ public class AdapterService extends Service { 
            enforceBluetoothPrivilegedPermission(service);



            service.disable();

            return service.factoryReset();



            if (service.mDatabaseManager != null) {

                service.mDatabaseManager.factoryReset();

            }

            return service.factoryResetNative();

        }



        @Override
@@ -2612,13 +2614,6 @@ public class AdapterService extends Service { 
        setDeviceAccessFromPrefs(device, value, SIM_ACCESS_PERMISSION_PREFERENCE_FILE);

    }



    boolean factoryReset() {

        if (mDatabaseManager != null) {

            mDatabaseManager.factoryReset();

        }

        return factoryResetNative();

    }



    void registerCallback(IBluetoothCallback cb) {

        mCallbacks.register(cb);

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ public class AdapterServiceTest { 
        byte[] obfuscatedAddress1 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress1.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress1));

        mAdapterService.factoryReset();

        mServiceBinder.factoryReset();

        byte[] obfuscatedAddress2 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress2.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress2));
@@ -642,7 +642,7 @@ public class AdapterServiceTest { 
        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress3));

        Assert.assertArrayEquals(obfuscatedAddress3,

                obfuscatedAddress2);

        mAdapterService.factoryReset();

        mServiceBinder.factoryReset();

        byte[] obfuscatedAddress4 = mAdapterService.obfuscateAddress(device);

        Assert.assertTrue(obfuscatedAddress4.length > 0);

        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress4));
@@ -666,7 +666,7 @@ public class AdapterServiceTest { 
        Assert.assertFalse(isByteArrayAllZero(obfuscatedAddress1));

        Assert.assertArrayEquals(obfuscateInJava(metricsSalt1, device),

                obfuscatedAddress1);

        mAdapterService.factoryReset();

        mServiceBinder.factoryReset();

        tearDown();

        setUp();

        // Cannot verify metrics salt since it is not written to disk until native cleanup