diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-05-22 16:21:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-22 16:21:20 +0000 |
| commit | 96616a57f3af05d4808fb5b84e758000f6ab5372 (patch) | |
| tree | 4a80120abb0267117d45e2a77fe5354f4c7561a4 /api | |
| parent | 67ba691ad6fbc6d0ee28635b40c87f4cddd61399 (diff) | |
| parent | f70c9346d6097be6967d0901830b00b84ae02a87 (diff) | |
| download | frameworks_base-96616a57f3af05d4808fb5b84e758000f6ab5372.zip frameworks_base-96616a57f3af05d4808fb5b84e758000f6ab5372.tar.gz frameworks_base-96616a57f3af05d4808fb5b84e758000f6ab5372.tar.bz2 | |
Merge "Use factory methods for RestrictionEntry" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 5640596..6b60aed 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8563,8 +8563,9 @@ package android.content { ctor public RestrictionEntry(java.lang.String, boolean); ctor public RestrictionEntry(java.lang.String, java.lang.String[]); ctor public RestrictionEntry(java.lang.String, int); - ctor public RestrictionEntry(java.lang.String, android.content.RestrictionEntry[], boolean); ctor public RestrictionEntry(android.os.Parcel); + method public static android.content.RestrictionEntry createBundleArrayEntry(java.lang.String, android.content.RestrictionEntry[]); + method public static android.content.RestrictionEntry createBundleEntry(java.lang.String, android.content.RestrictionEntry[]); method public int describeContents(); method public java.lang.String[] getAllSelectedStrings(); method public java.lang.String[] getChoiceEntries(); diff --git a/api/system-current.txt b/api/system-current.txt index eda3639..9900fdd 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8795,8 +8795,9 @@ package android.content { ctor public RestrictionEntry(java.lang.String, boolean); ctor public RestrictionEntry(java.lang.String, java.lang.String[]); ctor public RestrictionEntry(java.lang.String, int); - ctor public RestrictionEntry(java.lang.String, android.content.RestrictionEntry[], boolean); ctor public RestrictionEntry(android.os.Parcel); + method public static android.content.RestrictionEntry createBundleArrayEntry(java.lang.String, android.content.RestrictionEntry[]); + method public static android.content.RestrictionEntry createBundleEntry(java.lang.String, android.content.RestrictionEntry[]); method public int describeContents(); method public java.lang.String[] getAllSelectedStrings(); method public java.lang.String[] getChoiceEntries(); |