diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-09-01 22:55:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 22:55:04 -0700 |
commit | 8f5edc93b622bbdc33db24d348480fd7d55afb41 (patch) | |
tree | ee04837e6ce2587daec5e508d02bb344f97d9eaa /core/java | |
parent | 0ed0221e9c01753eb8cf312ea9d148a0097a99a1 (diff) | |
parent | 840f0fecd87357cadf4b2a0ae96d30b457f89729 (diff) | |
download | frameworks_base-8f5edc93b622bbdc33db24d348480fd7d55afb41.zip frameworks_base-8f5edc93b622bbdc33db24d348480fd7d55afb41.tar.gz frameworks_base-8f5edc93b622bbdc33db24d348480fd7d55afb41.tar.bz2 |
am 840f0fec: am d3efa392: Clean up some permissions.
Merge commit '840f0fecd87357cadf4b2a0ae96d30b457f89729'
* commit '840f0fecd87357cadf4b2a0ae96d30b457f89729':
Clean up some permissions.
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 3fe971f..068f821 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1751,6 +1751,9 @@ public class Activity extends ContextThemeWrapper } /** + * @deprecated This functionality will be removed in the future; please do + * not use. + * * Control whether this activity is required to be persistent. By default * activities are not persistent; setting this to true will prevent the * system from stopping this activity or its process when running low on @@ -1765,6 +1768,7 @@ public class Activity extends ContextThemeWrapper * persistent, true if so, false for the normal * behavior. */ + @Deprecated public void setPersistent(boolean isPersistent) { if (mParent == null) { try { |