Measurement: Update to latest revision (1345e4f8) · Commits · e / os / GmsCore

play-services-core/src/main/kotlin/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.kt

+38 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,6 @@ package com.google.android.gms.measurement.internal
	import android.content.Intent		import android.content.Intent
	import android.os.Bundle		import android.os.Bundle
	import android.os.Parcel		import android.os.Parcel
	import android.os.Parcelable
	import android.util.Log		import android.util.Log
	import androidx.annotation.Keep		import androidx.annotation.Keep
	import androidx.core.os.bundleOf		import androidx.core.os.bundleOf
	@@ -253,5 +252,43 @@ class AppMeasurementDynamiteService : IAppMeasurementDynamiteService.Stub() {
	Log.d(TAG, "Not yet implemented: setSgtmDebugInfo")		Log.d(TAG, "Not yet implemented: setSgtmDebugInfo")
	}		}

			override fun setCurrentScreenByScionActivityInfo(info: ScionActivityInfo?, screenName: String?, className: String?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: setCurrentScreenByScionActivityInfo")
			}

			override fun onActivityStartedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: onActivityStartedByScionActivityInfo")
			}

			override fun onActivityStoppedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: onActivityStoppedByScionActivityInfo")
			}

			override fun onActivityCreatedByScionActivityInfo(info: ScionActivityInfo?, savedInstanceState: Bundle?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: onActivityCreatedByScionActivityInfo")
			}

			override fun onActivityDestroyedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: onActivityDestroyedByScionActivityInfo")
			}

			override fun onActivityPausedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: onActivityPausedByScionActivityInfo")
			}

			override fun onActivityResumedByScionActivityInfo(info: ScionActivityInfo?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: onActivityResumedByScionActivityInfo")
			}

			override fun onActivitySaveInstanceStateByScionActivityInfo(info: ScionActivityInfo?, receiver: IBundleReceiver?, eventElapsedRealtime: Long) {
			Log.d(TAG, "Not yet implemented: onActivitySaveInstanceStateByScionActivityInfo")
			returnBundle(receiver, Bundle())
			}

			override fun retrieveAndUploadBatches(callback: IDynamiteUploadBatchesCallback?) {
			Log.d(TAG, "Not yet implemented: retrieveAndUploadBatches")
			runCatching { callback?.onUploadBatches() }
			}

	override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean = warnOnTransactionIssues(code, reply, flags, TAG) { super.onTransact(code, data, reply, flags) }		override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean = warnOnTransactionIssues(code, reply, flags, TAG) { super.onTransact(code, data, reply, flags) }
	}		}

play-services-measurement-base/build.gradle

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,4 +36,6 @@ description = 'microG implementation of play-services-clearcut'
	dependencies {		dependencies {
	// Dependencies from play-services-measurement-base:21.2.0		// Dependencies from play-services-measurement-base:21.2.0
	api project(':play-services-basement')		api project(':play-services-basement')

			annotationProcessor project(":safe-parcel-processor")
	}		}

play-services-measurement-base/src/main/aidl/com/google/android/gms/measurement/api/internal/IAppMeasurementDynamiteService.aidl

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,9 +2,11 @@ package com.google.android.gms.measurement.api.internal;

	import com.google.android.gms.dynamic.IObjectWrapper;		import com.google.android.gms.dynamic.IObjectWrapper;
	import com.google.android.gms.measurement.api.internal.IBundleReceiver;		import com.google.android.gms.measurement.api.internal.IBundleReceiver;
			import com.google.android.gms.measurement.api.internal.IDynamiteUploadBatchesCallback;
	import com.google.android.gms.measurement.api.internal.IEventHandlerProxy;		import com.google.android.gms.measurement.api.internal.IEventHandlerProxy;
	import com.google.android.gms.measurement.api.internal.IStringProvider;		import com.google.android.gms.measurement.api.internal.IStringProvider;
	import com.google.android.gms.measurement.api.internal.InitializationParams;		import com.google.android.gms.measurement.api.internal.InitializationParams;
			import com.google.android.gms.measurement.api.internal.ScionActivityInfo;

	interface IAppMeasurementDynamiteService {		interface IAppMeasurementDynamiteService {
	void initialize(in IObjectWrapper context, in InitializationParams params, long eventTimeMillis) = 0;		void initialize(in IObjectWrapper context, in InitializationParams params, long eventTimeMillis) = 0;
	@@ -55,4 +57,14 @@ interface IAppMeasurementDynamiteService {
	void getSessionId(IBundleReceiver receiver) = 45;		void getSessionId(IBundleReceiver receiver) = 45;

	void setSgtmDebugInfo(in Intent intent) = 47;		void setSgtmDebugInfo(in Intent intent) = 47;

			void setCurrentScreenByScionActivityInfo(in ScionActivityInfo info, String screenName, String className, long eventElapsedRealtime) = 49;
			void onActivityStartedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 50;
			void onActivityStoppedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 51;
			void onActivityCreatedByScionActivityInfo(in ScionActivityInfo info, in Bundle savedInstanceState, long eventElapsedRealtime) = 52;
			void onActivityDestroyedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 53;
			void onActivityPausedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 54;
			void onActivityResumedByScionActivityInfo(in ScionActivityInfo info, long eventElapsedRealtime) = 55;
			void onActivitySaveInstanceStateByScionActivityInfo(in ScionActivityInfo info, IBundleReceiver receiver, long eventElapsedRealtime) = 56;
			void retrieveAndUploadBatches(IDynamiteUploadBatchesCallback callback) = 57;
	}		}

play-services-measurement-base/src/main/aidl/com/google/android/gms/measurement/api/internal/IDynamiteUploadBatchesCallback.aidl

0 → 100644

+5 −0

Original line number	Original line	Diff line number	Diff line
			package com.google.android.gms.measurement.api.internal;

			interface IDynamiteUploadBatchesCallback {
			void onUploadBatches();
			}

play-services-measurement-base/src/main/aidl/com/google/android/gms/measurement/api/internal/ScionActivityInfo.aidl

0 → 100644

+3 −0

Original line number	Original line	Diff line number	Diff line
			package com.google.android.gms.measurement.api.internal;

			parcelable ScionActivityInfo;