diff options
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/api/current.txt b/api/current.txt index cb4a7db..6035322 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5999,6 +5999,7 @@ package android.content { field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token"; field public static final java.lang.String EXTRA_REPLACING = "android.intent.extra.REPLACING"; field public static final java.lang.String EXTRA_RESTRICTIONS = "android.intent.extra.restrictions"; + field public static final java.lang.String EXTRA_RESTRICTIONS_INTENT = "android.intent.extra.restrictions_intent"; field public static final java.lang.String EXTRA_RETURN_RESULT = "android.intent.extra.RETURN_RESULT"; field public static final java.lang.String EXTRA_SHORTCUT_ICON = "android.intent.extra.shortcut.ICON"; field public static final java.lang.String EXTRA_SHORTCUT_ICON_RESOURCE = "android.intent.extra.shortcut.ICON_RESOURCE"; @@ -6247,12 +6248,25 @@ package android.content { ctor public RestrictionEntry(java.lang.String, java.lang.String[]); ctor public RestrictionEntry(android.os.Parcel); method public int describeContents(); - method public boolean getBooleanValue(); - method public java.lang.String[] getMultipleValues(); - method public java.lang.String getStringValue(); - method public void setMultipleValues(java.lang.String[]); - method public void setValue(java.lang.String); - method public void setValue(boolean); + method public java.lang.String[] getAllSelectedStrings(); + method public java.lang.String[] getChoiceEntries(); + method public java.lang.String[] getChoiceValues(); + method public java.lang.String getDescription(); + method public java.lang.String getKey(); + method public boolean getSelectedState(); + method public java.lang.String getSelectedString(); + method public java.lang.String getTitle(); + method public int getType(); + method public void setAllSelectedStrings(java.lang.String[]); + method public void setChoiceEntries(java.lang.String[]); + method public void setChoiceEntries(android.content.Context, int); + method public void setChoiceValues(java.lang.String[]); + method public void setChoiceValues(android.content.Context, int); + method public void setDescription(java.lang.String); + method public void setSelectedState(boolean); + method public void setSelectedString(java.lang.String); + method public void setTitle(java.lang.String); + method public void setType(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; field public static final int TYPE_BOOLEAN = 1; // 0x1 @@ -6260,12 +6274,6 @@ package android.content { field public static final int TYPE_CHOICE_LEVEL = 3; // 0x3 field public static final int TYPE_MULTI_SELECT = 4; // 0x4 field public static final int TYPE_NULL = 0; // 0x0 - field public java.lang.String[] choices; - field public java.lang.String description; - field public java.lang.String key; - field public java.lang.String title; - field public int type; - field public java.lang.String[] values; } public class SearchRecentSuggestionsProvider extends android.content.ContentProvider { @@ -6658,6 +6666,7 @@ package android.content.pm { method public abstract boolean addPermission(android.content.pm.PermissionInfo); method public abstract boolean addPermissionAsync(android.content.pm.PermissionInfo); method public abstract deprecated void addPreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName); + method public android.content.Intent buildPermissionRequestIntent(java.lang.String...); method public abstract java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]); method public abstract int checkPermission(java.lang.String, java.lang.String); method public abstract int checkSignatures(java.lang.String, java.lang.String); @@ -6717,7 +6726,6 @@ package android.content.pm { method public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException; method public abstract deprecated void removePackageFromPreferred(java.lang.String); method public abstract void removePermission(java.lang.String); - method public android.content.Intent buildPermissionRequestIntent(java.lang.String...); method public abstract android.content.pm.ResolveInfo resolveActivity(android.content.Intent, int); method public abstract android.content.pm.ProviderInfo resolveContentProvider(java.lang.String, int); method public abstract android.content.pm.ResolveInfo resolveService(android.content.Intent, int); @@ -16810,13 +16818,13 @@ package android.os { method public void setUserRestriction(java.lang.String, boolean); method public void setUserRestrictions(android.os.Bundle); method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle); + field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth"; field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi"; field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps"; + field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources"; field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts"; field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location"; field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps"; - field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources"; - field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth"; field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer"; } |