diff options
| author | 2018-06-22 23:49:02 +0000 | |
|---|---|---|
| committer | 2018-06-22 23:49:02 +0000 | |
| commit | 849c351337307dacf1138bc59367af70684a176d (patch) | |
| tree | c13e9abcd8173e3f654ce396366264495f65c579 | |
| parent | 1b18b392069748066362b327e0cd76402bfebc07 (diff) | |
| parent | 5afde76fbec49eedc5e8ce15e57e69c5515b1132 (diff) | |
Merge "Make setPrivacy not a hidden api"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/IncidentReportArgs.java | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 43f10fd6055f..049a9d2bf9ed 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3927,6 +3927,7 @@ package android.os { method public void readFromParcel(android.os.Parcel); method public int sectionCount(); method public void setAll(boolean); + method public void setPrivacyPolicy(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR; } diff --git a/api/test-current.txt b/api/test-current.txt index 930ccd09d762..1e76d4a321ea 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -655,6 +655,7 @@ package android.os { method public void readFromParcel(android.os.Parcel); method public int sectionCount(); method public void setAll(boolean); + method public void setPrivacyPolicy(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR; } diff --git a/core/java/android/os/IncidentReportArgs.java b/core/java/android/os/IncidentReportArgs.java index 1aeac5f53be0..3ca7f77b90d7 100644 --- a/core/java/android/os/IncidentReportArgs.java +++ b/core/java/android/os/IncidentReportArgs.java @@ -144,7 +144,6 @@ public final class IncidentReportArgs implements Parcelable { /** * Set this incident report privacy policy spec. - * @hide */ public void setPrivacyPolicy(int dest) { switch (dest) { |