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

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

ActivityAttribution: Remove unused static code 

Bug: 291187783
Test: atest ActivityAttributionServiceTest
Test: atest BluetoothInstrumentationTests
Change-Id: If3e25a2fbe20e4eeb28eed0391764fd3f3455234
parent 00558558

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

+0 −1
Original line number Diff line number Diff line
@@ -716,7 +716,6 @@ public class AdapterService extends Service { 
        mBluetoothSocketManagerBinder = new BluetoothSocketManagerBinder(this);



        mActivityAttributionService = new ActivityAttributionService();

        mActivityAttributionService.start();



        setAdapterService(this);

android/app/src/com/android/bluetooth/btservice/activityAttribution/ActivityAttributionService.java

+14 −58
Original line number Diff line number Diff line
@@ -25,66 +25,30 @@ import java.util.Objects; 
 * based activities.

 */

public class ActivityAttributionService {

    private boolean mCleaningUp;

    private static ActivityAttributionService sActivityAttributionService;

    private static final boolean DBG = false;

    private static final String TAG = "ActivityAttributionService";

    private static final String TAG = ActivityAttributionService.class.getSimpleName()

    private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);



    private final ActivityAttributionNativeInterface mActivityAttributionNativeInterface =

            Objects.requireNonNull(

                    ActivityAttributionNativeInterface.getInstance(),

                    "ActivityAttributionNativeInterface "

                            + "cannot be null when ActivityAttributionService starts");

                    "ActivityAttributionNativeInterface cannot be null");



    /** Start and initialize the Activity Attribution service. */

    public void start() {

        debugLog("start()");



        if (sActivityAttributionService != null) {

            Log.e(TAG, "start() called twice");

            return;

        }



        // Mark service as started

        setActivityAttributionService(this);

    }

    private boolean mCleaned = false;



    /** Cleans up the Activity Attribution service. */

    public void cleanup() {

        debugLog("cleanup");

        if (mCleaningUp) {

            debugLog("already doing cleanup");

            return;

        }



        mCleaningUp = true;



        if (sActivityAttributionService == null) {

            debugLog("cleanup() called before start()");

        debugLog("cleanup()");

        if (mCleaned) {

            Log.e(TAG, "cleanup already called");

            return;

        }



        // Mark service as stopped

        setActivityAttributionService(null);

        mCleaned = true;



        // Cleanup native interface

        mActivityAttributionNativeInterface.cleanup();

    }



    /** Get the ActivityAttributionService instance */

    public static synchronized ActivityAttributionService getActivityAttributionService() {

        if (sActivityAttributionService == null) {

            Log.w(TAG, "getActivityAttributionService(): service is NULL");

            return null;

        }



        if (!sActivityAttributionService.isAvailable()) {

            Log.w(TAG, "getActivityAttributionService(): service is not available");

            return null;

        }

        return sActivityAttributionService;

    }



    /** Init JNI */

    public void initJni() {

        debugLog("initJni()");
@@ -94,24 +58,16 @@ public class ActivityAttributionService { 


    /** Notify the UID and package name of the app, and the address of associated active device */

    public void notifyActivityAttributionInfo(int uid, String packageName, String deviceAddress) {

        Log.d(TAG, "notifyActivityAttributionInfo"

                + " UID=" + uid

                + " packageName=" + packageName

                + " deviceAddress=" + deviceAddress);

        Log.d(

                TAG,

                "notifyActivityAttributionInfo()"

                        + (" UID=" + uid)

                        + (" packageName=" + packageName)

                        + (" deviceAddress=" + deviceAddress));

        mActivityAttributionNativeInterface.notifyActivityAttributionInfo(

                uid, packageName, deviceAddress);

    }



    private boolean isAvailable() {

        return !mCleaningUp;

    }



    private static synchronized void setActivityAttributionService(

            ActivityAttributionService instance) {

        debugLog("setActivityAttributionService(): set to: " + instance);

        sActivityAttributionService = instance;

    }



    private static void debugLog(String msg) {

        if (DBG) {

            Log.d(TAG, msg);

android/app/tests/unit/src/com/android/bluetooth/btservice/activityAttribution/ActivityAttributionServiceTest.java

+0 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.bluetooth.btservice.activityattribution;



import static com.google.common.truth.Truth.assertThat;



import android.os.Binder;

import android.os.Process;
@@ -37,8 +35,6 @@ public final class ActivityAttributionServiceTest { 
    public void setUp() {

        Assume.assumeTrue("Ignore test when the user is not primary.", isPrimaryUser());

        mActivityAttributionService = new ActivityAttributionService();

        mActivityAttributionService.start();

        assertThat(mActivityAttributionService).isNotNull();

    }



    @After
@@ -47,7 +43,6 @@ public final class ActivityAttributionServiceTest { 
            return;

        }

        mActivityAttributionService.cleanup();

        mActivityAttributionService = null;

    }



    private boolean isPrimaryUser() {