drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread

Browse Source 
Merge commit '49ec3dff4350209e109fc11dafe4294acea36146' into gingerbread-plus-aosp

* commit '49ec3dff4350209e109fc11dafe4294acea36146':
  OBB: Change documentation to reflect reality
This commit is contained in:
Kenny Root
2010-10-13 14:53:18 -07:00
committed by Android Git Automerger
parent bb5d7c2161 49ec3dff43
commit 2f98a585cd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/storage/OnObbStateChangeListener.java
View File

@ -67,9 +67,9 @@ public abstract class OnObbStateChangeListener {
public static final int ERROR_ALREADY_MOUNTED = 24; public static final int ERROR_ALREADY_MOUNTED = 24;
/** /**
* The current application does not have permission to use this OBB because * The current application does not have permission to use this OBB. This
* the OBB indicates it's owned by a different package or the key used to * could be because the OBB indicates it's owned by a different package or
* open it is incorrect. Returned in status messages from calls made via * some other error. Returned in status messages from calls made via
* {@link StorageManager} * {@link StorageManager}
*/ */
public static final int ERROR_PERMISSION_DENIED = 25; public static final int ERROR_PERMISSION_DENIED = 25;

8
native/include/android/storage_manager.h
View File

@ -74,10 +74,10 @@ enum {
AOBB_STATE_ERROR_ALREADY_MOUNTED = 24, AOBB_STATE_ERROR_ALREADY_MOUNTED = 24,
/* /*
* The current application does not have permission to use this OBB * The current application does not have permission to use this OBB.
* because the OBB indicates it's owned by a different package or the * This could be because the OBB indicates it's owned by a different
* key used to open it is incorrect. Can be returned as the status for * package. Can be returned as the status for callbacks made during
* callbacks made during asynchronous OBB actions. * asynchronous OBB actions.
*/ */
AOBB_STATE_ERROR_PERMISSION_DENIED = 25, AOBB_STATE_ERROR_PERMISSION_DENIED = 25,
}; };