summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-01-29 12:53:52 -0800
committerJean-Baptiste Queru <jbq@google.com>2011-01-29 12:54:09 -0800
commit1358b6a4fb68e81058aa938e46b125350bdf0fff (patch)
tree1f514c73a548f4d27b6ab679600dc02eb9694bdd
parent6b739dc7292452227cdd8abd90658f4db8f0ce70 (diff)
downloadframeworks_base-1358b6a4fb68e81058aa938e46b125350bdf0fff.zip
frameworks_base-1358b6a4fb68e81058aa938e46b125350bdf0fff.tar.gz
frameworks_base-1358b6a4fb68e81058aa938e46b125350bdf0fff.tar.bz2
Tweak to make merges easier
Bug: 3364311 Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
-rw-r--r--core/java/android/os/storage/IObbActionListener.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/storage/IObbActionListener.java b/core/java/android/os/storage/IObbActionListener.java
index 6a6292d..35da4b0 100644
--- a/core/java/android/os/storage/IObbActionListener.java
+++ b/core/java/android/os/storage/IObbActionListener.java
@@ -113,7 +113,7 @@ public interface IObbActionListener extends IInterface {
_data.writeInt(nonce);
_data.writeInt(status);
mRemote.transact(Stub.TRANSACTION_onObbResult, _data, _reply,
- Binder.FLAG_ONEWAY);
+ android.os.IBinder.FLAG_ONEWAY);
_reply.readException();
} finally {
_reply.recycle();