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

Commit 6981b524 authored by Manjeet Rulhania's avatar Manjeet Rulhania Committed by Android (Google) Code Review
Browse files

Merge "Suppress lint warning about final or onXXX naming convention" into main

parents 2869d1fd e9a8edee

core/java/android/app/Activity.java

+2 −0
Original line number Diff line number Diff line
@@ -5796,6 +5796,8 @@ public class Activity extends ContextThemeWrapper 
     * @see #onRequestPermissionsResult

     */

    @FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)

    @SuppressLint("OnNameExpected")

    // Suppress lint as this is an overload of the original API.

    public boolean shouldShowRequestPermissionRationale(@NonNull String permission, int deviceId) {

        final PackageManager packageManager = getDeviceId() == deviceId ? getPackageManager()

                : createDeviceContext(deviceId).getPackageManager();