diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-09-01 22:51:35 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 22:51:35 -0700 |
commit | 840f0fecd87357cadf4b2a0ae96d30b457f89729 (patch) | |
tree | 2bb31b208dc99b7f6621d83a221f74c152237e9c /core/java | |
parent | 14d56840eeec537c037bebaeaebf1b37f48d8dad (diff) | |
parent | d3efa3924407da6d38aa5931ac29aa088d9eb986 (diff) | |
download | frameworks_base-840f0fecd87357cadf4b2a0ae96d30b457f89729.zip frameworks_base-840f0fecd87357cadf4b2a0ae96d30b457f89729.tar.gz frameworks_base-840f0fecd87357cadf4b2a0ae96d30b457f89729.tar.bz2 |
am d3efa392: Clean up some permissions.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp
* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
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 f7a9a18..6e6e86f 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1620,6 +1620,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 @@ -1634,6 +1637,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 { |