[sl4a] Refactor ConnectivityManager/Service events/constants
Refactor the ConnectivityManager/Service events/constants out
of the telephony events/constants class into separate files.
Bug: 30368899
Change-Id: I7c4201ecfac3284fe6d3e226270600fd7013f1f7
diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java
new file mode 100644
index 0000000..55fac2d
--- /dev/null
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.googlecode.android_scripting.facade;
+
+/**
+ * Constants to be used in the facade for ConnectivityManager/Service.
+ */
+public class ConnectivityConstants {
+ /**
+ * Network callback master event name
+ */
+ public static final String EventNetworkCallback = "NetworkCallback";
+
+ /**
+ * Connectivity events - sub-names
+ */
+ public static final String NetworkCallbackPreCheck = "PreCheck";
+ public static final String NetworkCallbackAvailable = "Available";
+ public static final String NetworkCallbackLosing = "Losing";
+ public static final String NetworkCallbackLost = "Lost";
+ public static final String NetworkCallbackUnavailable = "Unavailable";
+ public static final String NetworkCallbackCapabilitiesChanged = "CapabilitiesChanged";
+ public static final String NetworkCallbackSuspended = "Suspended";
+ public static final String NetworkCallbackResumed = "Resumed";
+ public static final String NetworkCallbackLinkPropertiesChanged = "LinkPropertiesChanged";
+ public static final String NetworkCallbackInvalid = "Invalid";
+
+ /**
+ * Connectivity changed event
+ */
+ public static final String EventConnectivityChanged = "ConnectivityChanged";
+
+ /**
+ * Packet keep-alive event
+ */
+ public static final String EventPacketKeepaliveCallback = "PacketKeepaliveCallback";
+
+ /**
+ * Packet keep-alive - sub-names
+ */
+ public static final String PacketKeepaliveCallbackStarted = "Started";
+ public static final String PacketKeepaliveCallbackStopped = "Stopped";
+ public static final String PacketKeepaliveCallbackError = "Error";
+ public static final String PacketKeepaliveCallbackInvalid = "Invalid";
+
+ /**
+ * Constants for PacketKeepaliveEvent.
+ */
+ public static class PacketKeepaliveContainer {
+ public static final String ID = "id";
+ public static final String PACKET_KEEPALIVE_EVENT = "packetKeepaliveEvent";
+ }
+
+ /**
+ * Constants for NetworkCallbackEvent.
+ */
+ public static class NetworkCallbackContainer {
+ public static final String ID = "id";
+ public static final String NETWORK_CALLBACK_EVENT = "networkCallbackEvent";
+ public static final String MAX_MS_TO_LIVE = "maxMsToLive";
+ public static final String RSSI = "rssi";
+ }
+
+ /**
+ * Constants for OnStartTetheringCallback
+ */
+ public static final String TetheringStartedCallback = "ConnectivityManagerOnTetheringStarted";
+ public static final String TetheringFailedCallback = "ConnectivityManagerOnTetheringFailed";
+}
diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java
new file mode 100644
index 0000000..4cdd8c5
--- /dev/null
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.googlecode.android_scripting.facade;
+
+import com.googlecode.android_scripting.jsonrpc.JsonSerializable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Utility class for ConnectivityManager/Service events. Encapsulates the data in a JSON format
+ * to be used in the test script.
+ *
+ * Note that not all information is encapsulated. Add to the *Event classes as more information
+ * is needed.
+ */
+public class ConnectivityEvents {
+ /**
+ * Translates a packet keep-alive event to JSON.
+ */
+ public static class PacketKeepaliveEvent implements JsonSerializable {
+ private String mId;
+ private String mPacketKeepaliveEvent;
+
+ public PacketKeepaliveEvent(String id, String event) {
+ mId = id;
+ mPacketKeepaliveEvent = event;
+ }
+
+ /**
+ * Create a JSON data-structure.
+ */
+ public JSONObject toJSON() throws JSONException {
+ JSONObject packetKeepalive = new JSONObject();
+
+ packetKeepalive.put(
+ ConnectivityConstants.PacketKeepaliveContainer.ID,
+ mId);
+ packetKeepalive.put(
+ ConnectivityConstants.PacketKeepaliveContainer.PACKET_KEEPALIVE_EVENT,
+ mPacketKeepaliveEvent);
+
+ return packetKeepalive;
+ }
+ }
+
+ /**
+ * Translates a ConnectivityManager.NetworkCallback to JSON.
+ */
+ public static class NetworkCallbackEventBase implements JsonSerializable {
+ private String mId;
+ private String mNetworkCallbackEvent;
+
+ public NetworkCallbackEventBase(String id, String event) {
+ mId = id;
+ mNetworkCallbackEvent = event;
+ }
+
+ /**
+ * Create a JSON data-structure.
+ */
+ public JSONObject toJSON() throws JSONException {
+ JSONObject networkCallback = new JSONObject();
+
+ networkCallback.put(ConnectivityConstants.NetworkCallbackContainer.ID, mId);
+ networkCallback.put(
+ ConnectivityConstants.NetworkCallbackContainer.NETWORK_CALLBACK_EVENT,
+ mNetworkCallbackEvent);
+
+ return networkCallback;
+ }
+ }
+
+ /**
+ * Specializes NetworkCallbackEventBase to add information for the onLosing() callback.
+ */
+ public static class NetworkCallbackEventOnLosing extends NetworkCallbackEventBase {
+ private int mMaxMsToLive;
+
+ public NetworkCallbackEventOnLosing(String id, String event, int maxMsToLive) {
+ super(id, event);
+ mMaxMsToLive = maxMsToLive;
+ }
+
+ /**
+ * Create a JSON data-structure.
+ */
+ public JSONObject toJSON() throws JSONException {
+ JSONObject json = super.toJSON();
+ json.put(ConnectivityConstants.NetworkCallbackContainer.MAX_MS_TO_LIVE, mMaxMsToLive);
+ return json;
+ }
+ }
+
+ /**
+ * Specializes NetworkCallbackEventBase to add information for the onCapabilitiesChanged()
+ * callback.
+ */
+ public static class NetworkCallbackEventOnCapabilitiesChanged extends NetworkCallbackEventBase {
+ private int mRssi;
+
+ public NetworkCallbackEventOnCapabilitiesChanged(String id, String event, int rssi) {
+ super(id, event);
+ mRssi = rssi;
+ }
+
+ /**
+ * Create a JSON data-structure.
+ */
+ public JSONObject toJSON() throws JSONException {
+ JSONObject json = super.toJSON();
+ json.put(ConnectivityConstants.NetworkCallbackContainer.RSSI, mRssi);
+ return json;
+ }
+ }
+}
diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
index dec75ea..73dbace 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
@@ -22,20 +22,17 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.ConnectivityManager.PacketKeepaliveCallback;
import android.net.ConnectivityManager.PacketKeepalive;
+import android.net.ConnectivityManager.PacketKeepaliveCallback;
import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
import android.net.NetworkInfo;
-import android.provider.Settings.SettingNotFoundException;
+import android.net.NetworkRequest;
import android.os.Bundle;
+import android.provider.Settings.SettingNotFoundException;
import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.facade.telephony.TelephonyConstants;
-import com.googlecode.android_scripting.facade.telephony.TelephonyEvents;
import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
import com.googlecode.android_scripting.rpc.Rpc;
import com.googlecode.android_scripting.rpc.RpcOptional;
@@ -90,7 +87,7 @@
*/
for (NetworkInfo info : mManager.getAllNetworkInfo()) {
if (info.getType() == netType) {
- mEventFacade.postEvent(TelephonyConstants.EventConnectivityChanged, info);
+ mEventFacade.postEvent(ConnectivityConstants.EventConnectivityChanged, info);
}
}
}
@@ -128,8 +125,8 @@
Log.d("PacketKeepaliveCallback on start!");
if ((mEvents & EVENT_STARTED) == EVENT_STARTED) {
mEventFacade.postEvent(
- TelephonyConstants.EventPacketKeepaliveCallback,
- new TelephonyEvents.PacketKeepaliveEvent(
+ ConnectivityConstants.EventPacketKeepaliveCallback,
+ new ConnectivityEvents.PacketKeepaliveEvent(
mId,
getPacketKeepaliveReceiverEventString(EVENT_STARTED)));
}
@@ -140,8 +137,8 @@
Log.d("PacketKeepaliveCallback on stop!");
if ((mEvents & EVENT_STOPPED) == EVENT_STOPPED) {
mEventFacade.postEvent(
- TelephonyConstants.EventPacketKeepaliveCallback,
- new TelephonyEvents.PacketKeepaliveEvent(
+ ConnectivityConstants.EventPacketKeepaliveCallback,
+ new ConnectivityEvents.PacketKeepaliveEvent(
mId,
getPacketKeepaliveReceiverEventString(EVENT_STOPPED)));
}
@@ -152,8 +149,8 @@
Log.d("PacketKeepaliveCallback on error! - code:" + error);
if ((mEvents & EVENT_ERROR) == EVENT_ERROR) {
mEventFacade.postEvent(
- TelephonyConstants.EventPacketKeepaliveCallback,
- new TelephonyEvents.PacketKeepaliveEvent(
+ ConnectivityConstants.EventPacketKeepaliveCallback,
+ new ConnectivityEvents.PacketKeepaliveEvent(
mId,
getPacketKeepaliveReceiverEventString(EVENT_ERROR)));
}
@@ -204,12 +201,10 @@
Log.d("NetworkCallback onPreCheck");
if ((mEvents & EVENT_PRECHECK) == EVENT_PRECHECK) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventBase(
mId,
- getNetworkCallbackEventString(EVENT_PRECHECK),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ getNetworkCallbackEventString(EVENT_PRECHECK)));
}
}
@@ -218,12 +213,10 @@
Log.d("NetworkCallback onAvailable");
if ((mEvents & EVENT_AVAILABLE) == EVENT_AVAILABLE) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventBase(
mId,
- getNetworkCallbackEventString(EVENT_AVAILABLE),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ getNetworkCallbackEventString(EVENT_AVAILABLE)));
}
}
@@ -232,11 +225,10 @@
Log.d("NetworkCallback onLosing");
if ((mEvents & EVENT_LOSING) == EVENT_LOSING) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventOnLosing(
mId,
getNetworkCallbackEventString(EVENT_LOSING),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
maxMsToLive));
}
}
@@ -246,12 +238,10 @@
Log.d("NetworkCallback onLost");
if ((mEvents & EVENT_LOST) == EVENT_LOST) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventBase(
mId,
- getNetworkCallbackEventString(EVENT_LOST),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ getNetworkCallbackEventString(EVENT_LOST)));
}
}
@@ -260,12 +250,10 @@
Log.d("NetworkCallback onUnavailable");
if ((mEvents & EVENT_UNAVAILABLE) == EVENT_UNAVAILABLE) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventBase(
mId,
- getNetworkCallbackEventString(EVENT_UNAVAILABLE),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ getNetworkCallbackEventString(EVENT_UNAVAILABLE)));
}
}
@@ -276,12 +264,11 @@
networkCapabilities.getSignalStrength());
if ((mEvents & EVENT_CAPABILITIES_CHANGED) == EVENT_CAPABILITIES_CHANGED) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventOnCapabilitiesChanged(
mId,
getNetworkCallbackEventString(EVENT_CAPABILITIES_CHANGED),
- networkCapabilities.getSignalStrength(),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ networkCapabilities.getSignalStrength()));
}
}
@@ -290,12 +277,10 @@
Log.d("NetworkCallback onNetworkSuspended");
if ((mEvents & EVENT_SUSPENDED) == EVENT_SUSPENDED) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventBase(
mId,
- getNetworkCallbackEventString(EVENT_SUSPENDED),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ getNetworkCallbackEventString(EVENT_SUSPENDED)));
}
}
@@ -305,12 +290,10 @@
Log.d("NetworkCallback onLinkPropertiesChanged");
if ((mEvents & EVENT_LINK_PROPERTIES_CHANGED) == EVENT_LINK_PROPERTIES_CHANGED) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventBase(
mId,
- getNetworkCallbackEventString(EVENT_LINK_PROPERTIES_CHANGED),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ getNetworkCallbackEventString(EVENT_LINK_PROPERTIES_CHANGED)));
}
}
@@ -319,35 +302,33 @@
Log.d("NetworkCallback onNetworkResumed");
if ((mEvents & EVENT_RESUMED) == EVENT_RESUMED) {
mEventFacade.postEvent(
- TelephonyConstants.EventNetworkCallback,
- new TelephonyEvents.NetworkCallbackEvent(
+ ConnectivityConstants.EventNetworkCallback,
+ new ConnectivityEvents.NetworkCallbackEventBase(
mId,
- getNetworkCallbackEventString(EVENT_RESUMED),
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE,
- TelephonyEvents.NetworkCallbackEvent.INVALID_VALUE));
+ getNetworkCallbackEventString(EVENT_RESUMED)));
}
}
}
private static int getNetworkCallbackEvent(String event) {
switch (event) {
- case TelephonyConstants.NetworkCallbackPreCheck:
+ case ConnectivityConstants.NetworkCallbackPreCheck:
return NetworkCallback.EVENT_PRECHECK;
- case TelephonyConstants.NetworkCallbackAvailable:
+ case ConnectivityConstants.NetworkCallbackAvailable:
return NetworkCallback.EVENT_AVAILABLE;
- case TelephonyConstants.NetworkCallbackLosing:
+ case ConnectivityConstants.NetworkCallbackLosing:
return NetworkCallback.EVENT_LOSING;
- case TelephonyConstants.NetworkCallbackLost:
+ case ConnectivityConstants.NetworkCallbackLost:
return NetworkCallback.EVENT_LOST;
- case TelephonyConstants.NetworkCallbackUnavailable:
+ case ConnectivityConstants.NetworkCallbackUnavailable:
return NetworkCallback.EVENT_UNAVAILABLE;
- case TelephonyConstants.NetworkCallbackCapabilitiesChanged:
+ case ConnectivityConstants.NetworkCallbackCapabilitiesChanged:
return NetworkCallback.EVENT_CAPABILITIES_CHANGED;
- case TelephonyConstants.NetworkCallbackSuspended:
+ case ConnectivityConstants.NetworkCallbackSuspended:
return NetworkCallback.EVENT_SUSPENDED;
- case TelephonyConstants.NetworkCallbackResumed:
+ case ConnectivityConstants.NetworkCallbackResumed:
return NetworkCallback.EVENT_RESUMED;
- case TelephonyConstants.NetworkCallbackLinkPropertiesChanged:
+ case ConnectivityConstants.NetworkCallbackLinkPropertiesChanged:
return NetworkCallback.EVENT_LINK_PROPERTIES_CHANGED;
}
return NetworkCallback.EVENT_INVALID;
@@ -356,34 +337,34 @@
private static String getNetworkCallbackEventString(int event) {
switch (event) {
case NetworkCallback.EVENT_PRECHECK:
- return TelephonyConstants.NetworkCallbackPreCheck;
+ return ConnectivityConstants.NetworkCallbackPreCheck;
case NetworkCallback.EVENT_AVAILABLE:
- return TelephonyConstants.NetworkCallbackAvailable;
+ return ConnectivityConstants.NetworkCallbackAvailable;
case NetworkCallback.EVENT_LOSING:
- return TelephonyConstants.NetworkCallbackLosing;
+ return ConnectivityConstants.NetworkCallbackLosing;
case NetworkCallback.EVENT_LOST:
- return TelephonyConstants.NetworkCallbackLost;
+ return ConnectivityConstants.NetworkCallbackLost;
case NetworkCallback.EVENT_UNAVAILABLE:
- return TelephonyConstants.NetworkCallbackUnavailable;
+ return ConnectivityConstants.NetworkCallbackUnavailable;
case NetworkCallback.EVENT_CAPABILITIES_CHANGED:
- return TelephonyConstants.NetworkCallbackCapabilitiesChanged;
+ return ConnectivityConstants.NetworkCallbackCapabilitiesChanged;
case NetworkCallback.EVENT_SUSPENDED:
- return TelephonyConstants.NetworkCallbackSuspended;
+ return ConnectivityConstants.NetworkCallbackSuspended;
case NetworkCallback.EVENT_RESUMED:
- return TelephonyConstants.NetworkCallbackResumed;
+ return ConnectivityConstants.NetworkCallbackResumed;
case NetworkCallback.EVENT_LINK_PROPERTIES_CHANGED:
- return TelephonyConstants.NetworkCallbackLinkPropertiesChanged;
+ return ConnectivityConstants.NetworkCallbackLinkPropertiesChanged;
}
- return TelephonyConstants.NetworkCallbackInvalid;
+ return ConnectivityConstants.NetworkCallbackInvalid;
}
private static int getPacketKeepaliveReceiverEvent(String event) {
switch (event) {
- case TelephonyConstants.PacketKeepaliveCallbackStarted:
+ case ConnectivityConstants.PacketKeepaliveCallbackStarted:
return PacketKeepaliveReceiver.EVENT_STARTED;
- case TelephonyConstants.PacketKeepaliveCallbackStopped:
+ case ConnectivityConstants.PacketKeepaliveCallbackStopped:
return PacketKeepaliveReceiver.EVENT_STOPPED;
- case TelephonyConstants.PacketKeepaliveCallbackError:
+ case ConnectivityConstants.PacketKeepaliveCallbackError:
return PacketKeepaliveReceiver.EVENT_ERROR;
}
return PacketKeepaliveReceiver.EVENT_INVALID;
@@ -392,13 +373,13 @@
private static String getPacketKeepaliveReceiverEventString(int event) {
switch (event) {
case PacketKeepaliveReceiver.EVENT_STARTED:
- return TelephonyConstants.PacketKeepaliveCallbackStarted;
+ return ConnectivityConstants.PacketKeepaliveCallbackStarted;
case PacketKeepaliveReceiver.EVENT_STOPPED:
- return TelephonyConstants.PacketKeepaliveCallbackStopped;
+ return ConnectivityConstants.PacketKeepaliveCallbackStopped;
case PacketKeepaliveReceiver.EVENT_ERROR:
- return TelephonyConstants.PacketKeepaliveCallbackError;
+ return ConnectivityConstants.PacketKeepaliveCallbackError;
}
- return TelephonyConstants.PacketKeepaliveCallbackInvalid;
+ return ConnectivityConstants.PacketKeepaliveCallbackInvalid;
}
/**
@@ -407,12 +388,12 @@
class OnStartTetheringCallback extends ConnectivityManager.OnStartTetheringCallback {
@Override
public void onTetheringStarted() {
- mEventFacade.postEvent(TelephonyConstants.TetheringStartedCallback, null);
+ mEventFacade.postEvent(ConnectivityConstants.TetheringStartedCallback, null);
}
@Override
public void onTetheringFailed() {
- mEventFacade.postEvent(TelephonyConstants.TetheringFailedCallback, null);
+ mEventFacade.postEvent(ConnectivityConstants.TetheringFailedCallback, null);
}
}
diff --git a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyConstants.java b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyConstants.java
index a899e11..c8b1ff2 100644
--- a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyConstants.java
+++ b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyConstants.java
@@ -346,41 +346,6 @@
public static final String EventSignalStrengthChanged = "SignalStrengthChanged";
public static final String EventVolteServiceStateChanged = "VolteServiceStateChanged";
public static final String EventMessageWaitingIndicatorChanged = "MessageWaitingIndicatorChanged";
- public static final String EventConnectivityChanged = "ConnectivityChanged";
-
- /**
- * Constant for Packet Keep Alive Call Back
- * **/
- public static final String EventPacketKeepaliveCallback = "PacketKeepaliveCallback";
-
- /*Sub-Event Names*/
- public static final String PacketKeepaliveCallbackStarted = "Started";
- public static final String PacketKeepaliveCallbackStopped = "Stopped";
- public static final String PacketKeepaliveCallbackError = "Error";
- public static final String PacketKeepaliveCallbackInvalid = "Invalid";
-
- /**
- * Constant for Network Call Back
- */
- public static final String EventNetworkCallback = "NetworkCallback";
-
- /*Sub-Event Names*/
- public static final String NetworkCallbackPreCheck = "PreCheck";
- public static final String NetworkCallbackAvailable = "Available";
- public static final String NetworkCallbackLosing = "Losing";
- public static final String NetworkCallbackLost = "Lost";
- public static final String NetworkCallbackUnavailable = "Unavailable";
- public static final String NetworkCallbackCapabilitiesChanged = "CapabilitiesChanged";
- public static final String NetworkCallbackSuspended = "Suspended";
- public static final String NetworkCallbackResumed = "Resumed";
- public static final String NetworkCallbackLinkPropertiesChanged = "LinkPropertiesChanged";
- public static final String NetworkCallbackInvalid = "Invalid";
-
- /**
- * Constants for OnStartTetheringCallback
- */
- public static final String TetheringStartedCallback = "ConnectivityManagerOnTetheringStarted";
- public static final String TetheringFailedCallback = "ConnectivityManagerOnTetheringFailed";
/**
* Constant for Signal Strength fields
@@ -457,16 +422,4 @@
public static class VoLteServiceStateContainer {
public static final String SRVCC_STATE = "srvccState";
}
-
- public static class PacketKeepaliveContainer {
- public static final String ID = "id";
- public static final String PACKET_KEEPALIVE_EVENT = "packetKeepaliveEvent";
- }
-
- public static class NetworkCallbackContainer {
- public static final String ID = "id";
- public static final String NETWORK_CALLBACK_EVENT = "networkCallbackEvent";
- public static final String MAX_MS_TO_LIVE = "maxMsToLive";
- public static final String RSSI = "rssi";
- }
}
diff --git a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyEvents.java b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyEvents.java
index 2c2e621..9c9a05c 100644
--- a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyEvents.java
+++ b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyEvents.java
@@ -301,62 +301,4 @@
return messageWaitingIndicator;
}
}
-
- public static class PacketKeepaliveEvent implements JsonSerializable {
- private String mId;
- private String mPacketKeepaliveEvent;
-
- public PacketKeepaliveEvent(String id, String event) {
- mId = id;
- mPacketKeepaliveEvent = event;
- }
-
- public JSONObject toJSON() throws JSONException {
- JSONObject packetKeepalive = new JSONObject();
-
- packetKeepalive.put(
- TelephonyConstants.PacketKeepaliveContainer.ID,
- mId);
- packetKeepalive.put(
- TelephonyConstants.PacketKeepaliveContainer.PACKET_KEEPALIVE_EVENT,
- mPacketKeepaliveEvent);
-
- return packetKeepalive;
- }
- }
-
- public static class NetworkCallbackEvent implements JsonSerializable {
- public static final Integer INVALID_VALUE = null;
- private String mId;
- private String mNetworkCallbackEvent;
- private Integer mRssi;
- private Integer mMaxMsToLive;
-
- public NetworkCallbackEvent(String id, String event, Integer rssi, Integer maxMsToLive) {
- mId = id;
- mNetworkCallbackEvent = event;
- mRssi = rssi;
- mMaxMsToLive = maxMsToLive;
- }
-
- public JSONObject toJSON() throws JSONException {
- JSONObject networkCallback = new JSONObject();
-
- networkCallback.put(
- TelephonyConstants.NetworkCallbackContainer.ID,
- mId);
- networkCallback.put(
- TelephonyConstants.NetworkCallbackContainer.NETWORK_CALLBACK_EVENT,
- mNetworkCallbackEvent);
- networkCallback.put(
- TelephonyConstants.NetworkCallbackContainer.MAX_MS_TO_LIVE,
- mMaxMsToLive);
- networkCallback.put(
- TelephonyConstants.NetworkCallbackContainer.RSSI,
- mRssi);
-
- return networkCallback;
- }
- }
-
}
