diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-04-24 18:54:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-24 18:54:26 +0000 |
| commit | 1fd75d83c3a45189126979da42302340dbfafc86 (patch) | |
| tree | 2cf930db2d45e8d4ff54f00ac36de20d1206fb6d /core/java/android/app | |
| parent | d974380564df3d597903df212c7f56073803d5c5 (diff) | |
| parent | 672055e8d9972c6d8ee2ec20443246b7a7e6573e (diff) | |
| download | frameworks_base-1fd75d83c3a45189126979da42302340dbfafc86.zip frameworks_base-1fd75d83c3a45189126979da42302340dbfafc86.tar.gz frameworks_base-1fd75d83c3a45189126979da42302340dbfafc86.tar.bz2 | |
Merge "Add permission requirement annotation for KeyGuard"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/KeyguardManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 56cd53e..ebb3c43 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -16,6 +16,8 @@ package android.app; +import android.Manifest; +import android.annotation.RequiresPermission; import android.app.trust.ITrustManager; import android.content.Context; import android.content.Intent; @@ -111,6 +113,7 @@ public class KeyguardManager { * * @see #reenableKeyguard() */ + @RequiresPermission(Manifest.permission.DISABLE_KEYGUARD) public void disableKeyguard() { try { mWM.disableKeyguard(mToken, mTag); @@ -132,6 +135,7 @@ public class KeyguardManager { * * @see #disableKeyguard() */ + @RequiresPermission(Manifest.permission.DISABLE_KEYGUARD) public void reenableKeyguard() { try { mWM.reenableKeyguard(mToken); @@ -302,6 +306,7 @@ public class KeyguardManager { * once the user has gotten past the keyguard. */ @Deprecated + @RequiresPermission(Manifest.permission.DISABLE_KEYGUARD) public void exitKeyguardSecurely(final OnKeyguardExitResult callback) { try { mWM.exitKeyguardSecurely(new IOnKeyguardExitResult.Stub() { |