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

Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" am: 9bf0c496df am: a2cf5100f0

Browse Source 
Change-Id: I03f11783d5c6d3f38ea555763ba9242ecdffa05d
This commit is contained in:
Automerger Merge Worker
2020-02-03 22:41:13 +00:00
parent e9accecd1d a2cf5100f0
commit 5af991b0c5
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/module-app-current.txt
View File

@@ -1,9 +1 @@
// Signature format: 2.0 // Signature format: 2.0
package android.app {
public final class NotificationChannel implements android.os.Parcelable {
method public void setBlockableSystem(boolean);
}
}

1
api/system-current.txt
View File

@@ -553,6 +553,7 @@ package android.app {
method public int getUserLockedFields(); method public int getUserLockedFields();
method public boolean isDeleted(); method public boolean isDeleted();
method public void populateFromXml(org.xmlpull.v1.XmlPullParser); method public void populateFromXml(org.xmlpull.v1.XmlPullParser);
method public void setBlockableSystem(boolean);
method public org.json.JSONObject toJson() throws org.json.JSONException; method public org.json.JSONObject toJson() throws org.json.JSONException;
method public void writeXml(org.xmlpull.v1.XmlSerializer) throws java.io.IOException; method public void writeXml(org.xmlpull.v1.XmlSerializer) throws java.io.IOException;
} }

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

@@ -15,8 +15,6 @@
*/ */
package android.app; package android.app;
import static android.annotation.SystemApi.Client.MODULE_APPS;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
@@ -325,7 +323,7 @@ public final class NotificationChannel implements Parcelable {
* @param blockableSystem if {@code true}, allows users to block notifications on this channel. * @param blockableSystem if {@code true}, allows users to block notifications on this channel.
* @hide * @hide
*/ */
@SystemApi(client = MODULE_APPS) @SystemApi
@TestApi @TestApi
public void setBlockableSystem(boolean blockableSystem) { public void setBlockableSystem(boolean blockableSystem) {
mBlockableSystem = blockableSystem; mBlockableSystem = blockableSystem;