commit fa8e2f42362afe0a1a3b2c719c94189731de8947
author Tony Mak <tonymak@google.com> Fri May 20 16:09:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 20 16:09:49 2016 +0000
tree 49ef6d400dc9c1df9689b36c7cea28bcf10f7f61
parent 0b44a54fa461e9848a2bf4c3bdb040d2cf151408
parent 202c55bdd4089ac17a32ce387653e6168daa7324

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review am: f75eb1ac9c am: 9791fa1807
am: 202c55bdd4

* commit '202c55bdd4089ac17a32ce387653e6168daa7324':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: Id03614fc8339ef771abed39ac50ee4d6516b5638

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index a7d4dd4..3761c5a 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -58,7 +58,7 @@
 
 import java.lang.ref.WeakReference;
 
-import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_WORK_CALL;
+import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_ENTERPRISE_CALL;
 /**
  * Presenter for the Call Card Fragment.
  * <p>
@@ -427,7 +427,7 @@
 
     private void updatePrimaryCallState() {
         if (getUi() != null && mPrimary != null) {
-            boolean isWorkCall = mPrimary.hasProperty(PROPERTY_WORK_CALL)
+            boolean isWorkCall = mPrimary.hasProperty(PROPERTY_ENTERPRISE_CALL)
                     || (mPrimaryContactInfo == null ? false
                             : mPrimaryContactInfo.userType == ContactsUtils.USER_TYPE_WORK);
             getUi().setCallState(
@@ -763,7 +763,7 @@
                 .showIncomingVideo(mPrimary.getVideoState(), mPrimary.getState());
 
         // Call placed through a work phone account.
-        boolean hasWorkCallProperty = mPrimary.hasProperty(PROPERTY_WORK_CALL);
+        boolean hasWorkCallProperty = mPrimary.hasProperty(PROPERTY_ENTERPRISE_CALL);
 
         if (mPrimary.isConferenceCall()) {
             Log.d(TAG, "Update primary display info for conference call.");

InCallUI/src/com/android/incallui/StatusBarNotifier.java

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 7132ff9..cc87dd4 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -16,7 +16,7 @@
 
 package com.android.incallui;
 
-import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_WORK_CALL;
+import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_ENTERPRISE_CALL;
 import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST;
 import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ANSWER_VIDEO_INCOMING_CALL;
 import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ANSWER_VOICE_INCOMING_CALL;
@@ -557,7 +557,7 @@
         }
 
         // Is the call placed through work connection service.
-        boolean isWorkCall = call.hasProperty(PROPERTY_WORK_CALL);
+        boolean isWorkCall = call.hasProperty(PROPERTY_ENTERPRISE_CALL);
         if(userType == ContactsUtils.USER_TYPE_WORK || isWorkCall) {
             resId = getWorkStringFromPersonalString(resId);
         }