diff options
| author | 2024-06-10 20:36:17 +0000 | |
|---|---|---|
| committer | 2024-06-10 20:36:17 +0000 | |
| commit | b386957eaab8b9888b4d4a10b4e79b0bbd2b0051 (patch) | |
| tree | a53e21b1662008a87ffe37bba41d9548b44ce667 | |
| parent | 4efad65d81bdb7f35ccae407ccaffcde7f05096a (diff) | |
| parent | 0c73437caa4ce8674623a3d47fc97b06741054e0 (diff) | |
Merge "Fix some discrepancies in @Deprecated handling in Metalava" into main am: 0c73437caa
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>
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | test-mock/api/system-current.txt | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 23cccd630b73..2866e71dce91 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -5610,7 +5610,6 @@ package android.app { method @Deprecated public void onCancel(android.content.DialogInterface); method @Deprecated public android.app.Dialog onCreateDialog(android.os.Bundle); 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 setShowsDialog(boolean); method @Deprecated public void setStyle(int, int); diff --git a/test-mock/api/system-current.txt b/test-mock/api/system-current.txt index f35095743738..7d891c8150fd 100644 --- a/test-mock/api/system-current.txt +++ b/test-mock/api/system-current.txt @@ -28,7 +28,7 @@ package android.test.mock { method @Deprecated public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener); method @Deprecated public void revokeRuntimePermission(String, String, android.os.UserHandle); 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 boolean updateIntentVerificationStatusAsUser(String, int, int); method @Deprecated public void updatePermissionFlags(String, String, int, int, android.os.UserHandle); |