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

Commit 28eb2cad authored Oct 12, 2023 by Jihoon Kang Committed by Automerger Merge Worker Oct 12, 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 am: 7adff589 am: 04e0e4e9 am: 3c082272

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

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

parents 871083af 3c082272

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 {