Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update documentation" into rvc-dev am: c01b818bae am: 336ae52021

Browse Source 
Change-Id: I5d4486b5b1646b94cb651c689d52fb09666ca4a3
This commit is contained in:
TreeHugger Robot
2020-03-24 22:24:04 +00:00
committed by Automerger Merge Worker
parent 947cbc94e6 336ae52021
commit aab688087e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/NotificationManager.java
View File

@@ -29,6 +29,7 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ParceledListSlice; import android.content.pm.ParceledListSlice;
import android.content.pm.ShortcutInfo;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
@@ -841,7 +842,8 @@ public class NotificationManager {
} }
/** /**
* Returns the notification channel settings for a given channel and conversation id. * Returns the notification channel settings for a given channel and
* {@link ShortcutInfo#getId() conversation id}.
* *
* <p>The channel must belong to your package, or to a package you are an approved notification * <p>The channel must belong to your package, or to a package you are an approved notification
* delegate for (see {@link #canNotifyAsPackage(String)}), or it will not be returned. To query * delegate for (see {@link #canNotifyAsPackage(String)}), or it will not be returned. To query