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

Commit b386957e authored Jun 10, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jun 10, 2024

Merge "Fix some discrepancies in @Deprecated handling in Metalava" into main am: 0c73437c

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

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

parents 4efad65d 0c73437c

core/api/current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5610,7 +5610,6 @@ package android.app {
	method @Deprecated public void onCancel(android.content.DialogInterface);		method @Deprecated public void onCancel(android.content.DialogInterface);
	method @Deprecated public android.app.Dialog onCreateDialog(android.os.Bundle);		method @Deprecated public android.app.Dialog onCreateDialog(android.os.Bundle);
	method @Deprecated public void onDismiss(android.content.DialogInterface);		method @Deprecated public void onDismiss(android.content.DialogInterface);
	method public android.view.LayoutInflater onGetLayoutInflater(android.os.Bundle);
	method @Deprecated public void setCancelable(boolean);		method @Deprecated public void setCancelable(boolean);
	method @Deprecated public void setShowsDialog(boolean);		method @Deprecated public void setShowsDialog(boolean);
	method @Deprecated public void setStyle(int, int);		method @Deprecated public void setStyle(int, int);

test-mock/api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ package android.test.mock {
	method @Deprecated public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);		method @Deprecated public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
	method @Deprecated public void revokeRuntimePermission(String, String, android.os.UserHandle);		method @Deprecated public void revokeRuntimePermission(String, String, android.os.UserHandle);
	method @Deprecated public boolean setDefaultBrowserPackageNameAsUser(String, int);		method @Deprecated public boolean setDefaultBrowserPackageNameAsUser(String, int);
	method public String[] setPackagesSuspended(String[], boolean, android.os.PersistableBundle, android.os.PersistableBundle, String);		method @Deprecated public String[] setPackagesSuspended(String[], boolean, android.os.PersistableBundle, android.os.PersistableBundle, String);
	method @Deprecated public void setUpdateAvailable(String, boolean);		method @Deprecated public void setUpdateAvailable(String, boolean);
	method @Deprecated public boolean updateIntentVerificationStatusAsUser(String, int, int);		method @Deprecated public boolean updateIntentVerificationStatusAsUser(String, int, int);
	method @Deprecated public void updatePermissionFlags(String, String, int, int, android.os.UserHandle);		method @Deprecated public void updatePermissionFlags(String, String, int, int, android.os.UserHandle);