Merge "Prepare AttributionSource to expose to native" into sc-dev (a095d6b2) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,7 @@ java_defaults {
		"tv_tuner_resource_manager_aidl_interface-java",
		"soundtrigger_middleware-aidl-java",
		"modules-utils-os",
		"framework-permission-aidl-java",
		],
		}

+120 −265

File changed.

Preview size limit exceeded, changes collapsed.

+94 −408

File changed.

Preview size limit exceeded, changes collapsed.

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.os.Build.VERSION_CODES.S;

		import android.Manifest;
		import android.annotation.CheckResult;
		import android.annotation.IntDef;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -31,6 +32,7 @@ import android.annotation.UserIdInt;
		import android.app.ActivityManager;
		import android.app.ActivityThread;
		import android.app.AppGlobals;
		import android.app.AppOpsManager;
		import android.app.IActivityManager;
		import android.app.PropertyInvalidatedCache;
		import android.compat.annotation.ChangeId;
		@@ -63,6 +65,8 @@ import com.android.internal.R;
		import com.android.internal.annotations.Immutable;
		import com.android.internal.util.CollectionUtils;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;

+420 −0

File changed.

Preview size limit exceeded, changes collapsed.