commit c3968e62c44530369eb2ca73bc0f7290e53bd613
author linyuh <linyuh@google.com> Mon Nov 20 17:40:50 2017 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Nov 21 12:13:50 2017 -0800
tree 6319f60128a5eef914e5650cfbe3d659861b105b
parent a3990fc2f6450cbd8c2376d0533a4120c239b38b

Merge what's left in InCallActivityCommon into InCallActivity.

Bug: 69272096
Test: None
PiperOrigin-RevId: 176443652
Change-Id: I90da4789deb4b6337a38cfe010b8aee5090d35e0

java/com/android/incallui/StatusBarNotifier.java

diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 0a0aa5e..4da858f 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -1007,11 +1007,11 @@
         InCallActivity.getIntent(
             mContext, false /* showDialpad */, false /* newOutgoingCall */, isFullScreen);
 
-    int requestCode = InCallActivity.PENDING_INTENT_REQUEST_CODE_NON_FULL_SCREEN;
+    int requestCode = InCallActivity.PendingIntentRequestCodes.NON_FULL_SCREEN;
     if (isFullScreen) {
       // Use a unique request code so that the pending intent isn't clobbered by the
       // non-full screen pending intent.
-      requestCode = InCallActivity.PENDING_INTENT_REQUEST_CODE_FULL_SCREEN;
+      requestCode = InCallActivity.PendingIntentRequestCodes.FULL_SCREEN;
     }
 
     // PendingIntent that can be used to launch the InCallActivity.  The