Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 733e79c2 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

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

Merge commit '2f98a585'

* commit '2f98a585':
  OBB: Change documentation to reflect reality
parents 4bd4bd6f 2f98a585

core/java/android/os/storage/OnObbStateChangeListener.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

native/include/android/storage_manager.h

+4 −4
Original line number Diff line number Diff line
@@ -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,

};