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

Commit 275f9ea0 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Rename API: NotificationManager canUseFullScreenIntent" into udc-dev am: 484b6b01 

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



Change-Id: If7d57aa316553fb3e28bc3d8e2c9830e4999deaa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05a0891b 484b6b01

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6784,7 +6784,7 @@ package android.app { 
    method public boolean areNotificationsEnabled();

    method public boolean areNotificationsPaused();

    method public boolean canNotifyAsPackage(@NonNull String);

    method public boolean canSendFullScreenIntent();

    method public boolean canUseFullScreenIntent();

    method public void cancel(int);

    method public void cancel(@Nullable String, int);

    method public void cancelAll();

core/java/android/app/NotificationManager.java

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ public class NotificationManager { 
     * permission to your manifest, and use

     * {@link android.provider.Settings#ACTION_MANAGE_APP_USE_FULL_SCREEN_INTENT}.

     */

    public boolean canSendFullScreenIntent() {

    public boolean canUseFullScreenIntent() {

        final int result = PermissionChecker.checkPermissionForPreflight(mContext,

                android.Manifest.permission.USE_FULL_SCREEN_INTENT,

                mContext.getAttributionSource());