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

Commit 7adff589 authored Oct 11, 2023 by Jihoon Kang Committed by Automerger Merge Worker Oct 11, 2023

Merge "Prepare for keeping concrete overrides of abstract methods" into main...

Merge "Prepare for keeping concrete overrides of abstract methods" into main am: fc916490 am: 02afbeb8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781309

Change-Id: I3321fed91aba239a203690248514b33bf0f296ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 32f8eb66 02afbeb8

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		// - add-additional-overrides=no
		// - migrating=Migration in progress see b/299366704
		package android {

		public final class Manifest {

core/api/module-lib-current.txt

+2 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		// - add-additional-overrides=no
		// - migrating=Migration in progress see b/299366704
		package android {

		public static final class Manifest.permission {

core/api/module-lib-removed.txt

+2 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		// - add-additional-overrides=no
		// - migrating=Migration in progress see b/299366704

core/api/removed.txt

+2 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		// - add-additional-overrides=no
		// - migrating=Migration in progress see b/299366704
		package android.app {

		public class Notification implements android.os.Parcelable {

core/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		// - add-additional-overrides=no
		// - migrating=Migration in progress see b/299366704
		package android {

		public static final class Manifest.permission {