From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Thu, 1 Mar 2018 03:48:32 +0000 (+0000)
Subject: Merge "Plumb PhysicalChannelConfig all the way up."
X-Git-Tag: android-x86-9.0-r1~192^2~1^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=44d13875ff;p=android-x86%2Fframeworks-base.git

Merge "Plumb PhysicalChannelConfig all the way up."
---

44d13875fffebdbe5ae48bcec85949988714337e
diff --cc services/core/java/com/android/server/TelephonyRegistry.java
index 8b5176e2c858,ceb213594b8e..e202618df575
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@@ -35,8 -35,8 +35,9 @@@ import android.os.UserHandle
  import android.telephony.CellInfo;
  import android.telephony.CellLocation;
  import android.telephony.DisconnectCause;
 +import android.telephony.LocationAccessPolicy;
  import android.telephony.PhoneStateListener;
+ import android.telephony.PhysicalChannelConfig;
  import android.telephony.PreciseCallState;
  import android.telephony.PreciseDataConnectionState;
  import android.telephony.PreciseDisconnectCause;