diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-05-06 12:14:31 +0100 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2015-05-06 13:19:22 +0100 |
| commit | bece80645e2b2d84ea65aabfa7fc01d5ad633708 (patch) | |
| tree | 896aa05b1399aca5528974b75dac23a8b8e4b18d /api | |
| parent | d4474cb9454c7a8b907c0be07236ffed4ecf3fd8 (diff) | |
| download | frameworks_base-bece80645e2b2d84ea65aabfa7fc01d5ad633708.zip frameworks_base-bece80645e2b2d84ea65aabfa7fc01d5ad633708.tar.gz frameworks_base-bece80645e2b2d84ea65aabfa7fc01d5ad633708.tar.bz2 | |
Rename functions that disable status bar and keyguard
Rename the DevicePolicyManager functions setKeyguardEnabledState and
setStatusBarEnabledState to setKeyguardDisabled and
setStatusBarDisabled respectively.
Bug: 20820039
Change-Id: I06f6a19ac55b24e66e9f2cb340ead5d940cb2235
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 07a4ff7..cf06c3b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5789,8 +5789,8 @@ package android.app.admin { method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean); method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String); + method public boolean setKeyguardDisabled(android.content.ComponentName, boolean); method public void setKeyguardDisabledFeatures(android.content.ComponentName, int); - method public boolean setKeyguardEnabledState(android.content.ComponentName, boolean); method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException; method public void setMasterVolumeMuted(android.content.ComponentName, boolean); method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int); @@ -5816,7 +5816,7 @@ package android.app.admin { method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName); method public void setScreenCaptureDisabled(android.content.ComponentName, boolean); method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String); - method public void setStatusBarEnabledState(android.content.ComponentName, boolean); + method public boolean setStatusBarDisabled(android.content.ComponentName, boolean); method public int setStorageEncryption(android.content.ComponentName, boolean); method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy); method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle); diff --git a/api/system-current.txt b/api/system-current.txt index 2880446..58612b6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5893,8 +5893,8 @@ package android.app.admin { method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean); method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String); + method public boolean setKeyguardDisabled(android.content.ComponentName, boolean); method public void setKeyguardDisabledFeatures(android.content.ComponentName, int); - method public boolean setKeyguardEnabledState(android.content.ComponentName, boolean); method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException; method public void setMasterVolumeMuted(android.content.ComponentName, boolean); method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int); @@ -5920,7 +5920,7 @@ package android.app.admin { method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName); method public void setScreenCaptureDisabled(android.content.ComponentName, boolean); method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String); - method public void setStatusBarEnabledState(android.content.ComponentName, boolean); + method public boolean setStatusBarDisabled(android.content.ComponentName, boolean); method public int setStorageEncryption(android.content.ComponentName, boolean); method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy); method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle); |