summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-09-07 17:43:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-07 17:43:04 -0700
commita420cc460c05b9f078327862a060b3ba67057582 (patch)
treebb1ac8537b1c159104a57a3099409fb3089aabfa /wifi
parent511f8e2ff23c480808d831125f3c93d4cbd15f59 (diff)
parentf0ef26af3430b9c6402a34eeb9248f805d570922 (diff)
downloadframeworks_base-a420cc460c05b9f078327862a060b3ba67057582.zip
frameworks_base-a420cc460c05b9f078327862a060b3ba67057582.tar.gz
frameworks_base-a420cc460c05b9f078327862a060b3ba67057582.tar.bz2
Merge "Fix system crash on p2p failure"
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/p2p/WifiP2pService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
index b848f82..e2b2249 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@ -1211,6 +1211,11 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
mReplyChannel.replyToMessage(msg, what);
}
+ private void replyToMessage(Message msg, int what, int arg1) {
+ if (msg.replyTo == null) return;
+ mReplyChannel.replyToMessage(msg, what, arg1);
+ }
+
private void replyToMessage(Message msg, int what, Object obj) {
if (msg.replyTo == null) return;
mReplyChannel.replyToMessage(msg, what, obj);