diff options
| author | Kenny Root <kroot@google.com> | 2010-10-15 08:32:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 08:32:30 -0700 |
| commit | 733e79c24042145d12a18cac59e8edb08965fab0 (patch) | |
| tree | 55a0da888e5fecbb8c63f888519cb624a3c5a84e | |
| parent | 4bd4bd6fc05ab7108f4f59f98bd6b595cec58e02 (diff) | |
| parent | 2f98a585cda066689b1b525322c51fcacbc3770b (diff) | |
| download | frameworks_base-733e79c24042145d12a18cac59e8edb08965fab0.zip frameworks_base-733e79c24042145d12a18cac59e8edb08965fab0.tar.gz frameworks_base-733e79c24042145d12a18cac59e8edb08965fab0.tar.bz2 | |
am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread
Merge commit '2f98a585cda066689b1b525322c51fcacbc3770b'
* commit '2f98a585cda066689b1b525322c51fcacbc3770b':
OBB: Change documentation to reflect reality
| -rw-r--r-- | core/java/android/os/storage/OnObbStateChangeListener.java | 6 | ||||
| -rw-r--r-- | native/include/android/storage_manager.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/os/storage/OnObbStateChangeListener.java b/core/java/android/os/storage/OnObbStateChangeListener.java index 950195b..1fb1782 100644 --- a/core/java/android/os/storage/OnObbStateChangeListener.java +++ b/core/java/android/os/storage/OnObbStateChangeListener.java @@ -67,9 +67,9 @@ public abstract class OnObbStateChangeListener { public static final int ERROR_ALREADY_MOUNTED = 24; /** - * The current application does not have permission to use this OBB because - * the OBB indicates it's owned by a different package or the key used to - * open it is incorrect. Returned in status messages from calls made via + * The current application does not have permission to use this OBB. This + * could be because the OBB indicates it's owned by a different package or + * some other error. Returned in status messages from calls made via * {@link StorageManager} */ public static final int ERROR_PERMISSION_DENIED = 25; diff --git a/native/include/android/storage_manager.h b/native/include/android/storage_manager.h index c202693..bad2491 100644 --- a/native/include/android/storage_manager.h +++ b/native/include/android/storage_manager.h @@ -74,10 +74,10 @@ enum { AOBB_STATE_ERROR_ALREADY_MOUNTED = 24, /* - * The current application does not have permission to use this OBB - * because the OBB indicates it's owned by a different package or the - * key used to open it is incorrect. Can be returned as the status for - * callbacks made during asynchronous OBB actions. + * The current application does not have permission to use this OBB. + * This could be because the OBB indicates it's owned by a different + * package. Can be returned as the status for callbacks made during + * asynchronous OBB actions. */ AOBB_STATE_ERROR_PERMISSION_DENIED = 25, }; |