commit 0c2d4d6f2cd68f90d187b5df5f75ec42adaa4eb2
author Hall Liu <hallliu@google.com> Tue Sep 18 14:04:38 2018 -0700
committer Hall Liu <hallliu@google.com> Wed Sep 19 00:10:50 2018 +0000
tree bb61ef5fedcdad2a87574ef406c5e5da79890e59
parent 6bf3b2903e30bb303733704aa574e26095d95cfe

Add extra line to avoid merge conflict

Change-Id: Ie7f0e0b097ebb2a568b951c6d4b27b70f1e3d520
Merged-In: Id468b6ce538a94fd79fac87ae97dfadae31ea598

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 0cb4a56..44e922e 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1258,6 +1258,7 @@
             EventLog.writeEvent(0x534e4554, "67862398", -1, "");
             throw new SecurityException("MODIFY_PHONE_STATE permission required.");
         }
+
         final long identity = Binder.clearCallingIdentity();
         try {
             return (Boolean) sendRequest(CMD_END_CALL, null, new Integer(subId));