diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-21 17:26:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-21 15:42:19 +0000 |
| commit | 1716baa6d3f0691087a7d512fc289bd88babda1c (patch) | |
| tree | a19d71b6d38cc0c3d1fedd9c7f9fc4df1792efb6 /core/java/android/content | |
| parent | e6ab031e3cc13c84671994e0719a463992e9ca3d (diff) | |
| parent | 7f72f53704cbee26dc2a0be429b8446b2493226c (diff) | |
| download | frameworks_base-1716baa6d3f0691087a7d512fc289bd88babda1c.zip frameworks_base-1716baa6d3f0691087a7d512fc289bd88babda1c.tar.gz frameworks_base-1716baa6d3f0691087a7d512fc289bd88babda1c.tar.bz2 | |
Merge "Rename flag and attribute per API council" into lmp-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index bcf1e87..dbf49c5 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -112,7 +112,7 @@ public class ActivityInfo extends ComponentInfo * Constant corresponding to <code>doNotPersist</code> in * the {@link android.R.attr#persistableMode} attribute. */ - public static final int DO_NOT_PERSIST = 1; + public static final int PERSIST_NEVER = 1; /** * Constant corresponding to <code>persistAcrossReboots</code> in * the {@link android.R.attr#persistableMode} attribute. @@ -667,7 +667,7 @@ public class ActivityInfo extends ComponentInfo private String persistableModeToString() { switch(persistableMode) { case PERSIST_ROOT_ONLY: return "PERSIST_ROOT_ONLY"; - case DO_NOT_PERSIST: return "DO_NOT_PERSIST"; + case PERSIST_NEVER: return "PERSIST_NEVER"; case PERSIST_ACROSS_REBOOTS: return "PERSIST_ACROSS_REBOOTS"; default: return "UNKNOWN=" + persistableMode; } |