diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2015-06-23 08:44:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 08:44:49 +0000 |
| commit | 2c3c66a2cf06b4d081f539a1fa01b44780cc65dc (patch) | |
| tree | b29af36969ddab08045a42d076ac06e2024074a6 /api/system-current.txt | |
| parent | 02ebcdb91101020f1897d50ed6d2e7ad048a5cec (diff) | |
| parent | 4045d24971fea4f1506ac8f16d4deeb76ac415fe (diff) | |
| download | frameworks_base-2c3c66a2cf06b4d081f539a1fa01b44780cc65dc.zip frameworks_base-2c3c66a2cf06b4d081f539a1fa01b44780cc65dc.tar.gz frameworks_base-2c3c66a2cf06b4d081f539a1fa01b44780cc65dc.tar.bz2 | |
Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 2353b3f..bb0c7f3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28633,6 +28633,7 @@ package android.provider { field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled"; field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail"; field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger"; + field public static final java.lang.String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN = "wifi_device_owner_configs_lockdown"; field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count"; field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms"; field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on"; |