summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-04-04 14:09:30 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-04-04 14:09:30 -0700
commit961d55e1cbf6cd5c5c5e85d5594347479048cf6e (patch)
tree8d4f8e5bedd22a1a12c747dcc5d29e3e6fdb3e60
parentb7c4768b65e6dd43aa12bceb6f98b59ca177134c (diff)
parentf324c8aba74492b74e8e722a22de522f4ae295b4 (diff)
downloadandroid_packages_apps_InCallUI-961d55e1cbf6cd5c5c5e85d5594347479048cf6e.tar.gz
android_packages_apps_InCallUI-961d55e1cbf6cd5c5c5e85d5594347479048cf6e.tar.bz2
android_packages_apps_InCallUI-961d55e1cbf6cd5c5c5e85d5594347479048cf6e.zip
Merge "Change dataUsage from long to int"
-rw-r--r--src/com/android/incallui/InCallVideoCallListener.java2
-rw-r--r--src/com/android/incallui/InCallVideoCallListenerNotifier.java4
-rw-r--r--src/com/android/incallui/VideoCallFragment.java2
-rw-r--r--src/com/android/incallui/VideoCallPresenter.java4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/incallui/InCallVideoCallListener.java b/src/com/android/incallui/InCallVideoCallListener.java
index 3acde5bb..080acc57 100644
--- a/src/com/android/incallui/InCallVideoCallListener.java
+++ b/src/com/android/incallui/InCallVideoCallListener.java
@@ -137,7 +137,7 @@ public class InCallVideoCallListener extends VideoCall.Listener {
* @param dataUsage The updated data usage.
*/
@Override
- public void onCallDataUsageChanged(long dataUsage) {
+ public void onCallDataUsageChanged(int dataUsage) {
Log.d(this, "onCallDataUsageChanged: dataUsage = " + dataUsage);
InCallVideoCallListenerNotifier.getInstance().callDataUsageChanged(dataUsage);
}
diff --git a/src/com/android/incallui/InCallVideoCallListenerNotifier.java b/src/com/android/incallui/InCallVideoCallListenerNotifier.java
index 126fa488..dd551598 100644
--- a/src/com/android/incallui/InCallVideoCallListenerNotifier.java
+++ b/src/com/android/incallui/InCallVideoCallListenerNotifier.java
@@ -244,7 +244,7 @@ public class InCallVideoCallListenerNotifier {
*
* @param dataUsage data usage value
*/
- public void callDataUsageChanged(long dataUsage) {
+ public void callDataUsageChanged(int dataUsage) {
for (VideoEventListener listener : mVideoEventListeners) {
listener.onCallDataUsageChange(dataUsage);
}
@@ -316,7 +316,7 @@ public class InCallVideoCallListenerNotifier {
*
* @param dataUsage call data usage value
*/
- public void onCallDataUsageChange(long dataUsage);
+ public void onCallDataUsageChange(int dataUsage);
/**
* Called when call session event is raised.
diff --git a/src/com/android/incallui/VideoCallFragment.java b/src/com/android/incallui/VideoCallFragment.java
index 930e96ae..f7b2cd87 100644
--- a/src/com/android/incallui/VideoCallFragment.java
+++ b/src/com/android/incallui/VideoCallFragment.java
@@ -964,7 +964,7 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter,
* @param dataUsage the data usage value
*/
@Override
- public void setCallDataUsage(Context context, long dataUsage) {
+ public void setCallDataUsage(Context context, int dataUsage) {
Log.d(this, "setDataUsage: dataUsage = " + dataUsage);
Toast.makeText(context, "dataUsage=" + dataUsage, Toast.LENGTH_LONG).show();
}
diff --git a/src/com/android/incallui/VideoCallPresenter.java b/src/com/android/incallui/VideoCallPresenter.java
index 84ce732a..53941dcf 100644
--- a/src/com/android/incallui/VideoCallPresenter.java
+++ b/src/com/android/incallui/VideoCallPresenter.java
@@ -939,7 +939,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
* @param dataUsage call data usage value
*/
@Override
- public void onCallDataUsageChange(long dataUsage) {
+ public void onCallDataUsageChange(int dataUsage) {
Log.d(this, "onCallDataUsageChange dataUsage=" + dataUsage);
VideoCallUi ui = getUi();
if (ui == null) {
@@ -1182,7 +1182,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
void setPreviewSize(int width, int height);
void setPreviewSurfaceSize(int width, int height);
void setDisplayVideoSize(int width, int height);
- void setCallDataUsage(Context context, long dataUsage);
+ void setCallDataUsage(Context context, int dataUsage);
void displayCallSessionEvent(int event);
Point getScreenSize();
void cleanupSurfaces();