From 2a03dd50ce5ea8e262451952ae8a80d0514f1092 Mon Sep 17 00:00:00 2001
From: Chen Xu <fionaxu@google.com>
Date: Mon, 16 Sep 2019 18:16:46 -0700
Subject: [PATCH] move IApnSourceService.aidl to android.service.carrier

Bug: 140908357
Test: Build & Manual
Change-Id: I21b83798f5ecd819627a7168c167cf3cfe99dd68
(cherry picked from commit 478ba408d3850944b44171cc2ef619719951f30f)
Merged-in: I21b83798f5ecd819627a7168c167cf3cfe99dd68
---
 core/java/android/service/carrier/ApnService.java              | 2 +-
 .../java/android/service/carrier}/IApnSourceService.aidl       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename {telephony/java/com/android/internal/telephony => core/java/android/service/carrier}/IApnSourceService.aidl (94%)

diff --git a/core/java/android/service/carrier/ApnService.java b/core/java/android/service/carrier/ApnService.java
index 57e4b1b407488..0c12fd409078b 100644
--- a/core/java/android/service/carrier/ApnService.java
+++ b/core/java/android/service/carrier/ApnService.java
@@ -26,7 +26,7 @@ import android.content.Intent;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.android.internal.telephony.IApnSourceService;
+import android.service.carrier.IApnSourceService;
 
 import java.util.List;
 
diff --git a/telephony/java/com/android/internal/telephony/IApnSourceService.aidl b/core/java/android/service/carrier/IApnSourceService.aidl
similarity index 94%
rename from telephony/java/com/android/internal/telephony/IApnSourceService.aidl
rename to core/java/android/service/carrier/IApnSourceService.aidl
index 34c9067c3f2f7..fadd2ff1a772b 100644
--- a/telephony/java/com/android/internal/telephony/IApnSourceService.aidl
+++ b/core/java/android/service/carrier/IApnSourceService.aidl
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.internal.telephony;
+package android.service.carrier;
 
 import android.content.ContentValues;
 
+/** @hide */
 interface IApnSourceService {
     /** Retreive APNs. */
     ContentValues[] getApns(int subId);