Merge "Initialize native Interface at object creation" into main (d9974a52) · Commits · e / os / android_packages_modules_Bluetooth

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

+5 −8

Original line number	Diff line number	Diff line
		@@ -30,7 +30,11 @@ public class ActivityAttributionService {
		private static final boolean DBG = false;
		private static final String TAG = "ActivityAttributionService";

		ActivityAttributionNativeInterface mActivityAttributionNativeInterface;
		private final ActivityAttributionNativeInterface mActivityAttributionNativeInterface =
		Objects.requireNonNull(
		ActivityAttributionNativeInterface.getInstance(),
		"ActivityAttributionNativeInterface "
		+ "cannot be null when ActivityAttributionService starts");

		/** Start and initialize the Activity Attribution service. */
		public void start() {
		@@ -41,12 +45,6 @@ public class ActivityAttributionService {
		return;
		}

		mActivityAttributionNativeInterface =
		Objects.requireNonNull(
		ActivityAttributionNativeInterface.getInstance(),
		"ActivityAttributionNativeInterface "
		+ "cannot be null when ActivityAttributionService starts");

		// Mark service as started
		setActivityAttributionService(this);
		}
		@@ -71,7 +69,6 @@ public class ActivityAttributionService {

		// Cleanup native interface
		mActivityAttributionNativeInterface.cleanup();
		mActivityAttributionNativeInterface = null;
		}

		/** Get the ActivityAttributionService instance */