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

Commit 518864c0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix some discrepancies in @Deprecated handling in Metalava" into main... 

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

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



Change-Id: I29a5ac73a4a69340a7edd37cda2cf580f1da10ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aede7f27 b386957e

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5605,7 +5605,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);

test-mock/api/system-current.txt

+1 −1
Original line number 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 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);