diff options
| author | 2019-11-27 13:34:51 -0800 | |
|---|---|---|
| committer | 2019-11-27 13:34:51 -0800 | |
| commit | 3963cb45d12e179f851a5f3586548207b781bfa5 (patch) | |
| tree | 3dad74c60ae5326a627a928c9dc16610dde6737e | |
| parent | 9b84a44f04d0a86beadfebd2d5c23e84bc4d122f (diff) | |
| parent | 306786abd496f026a03312162a208df35fa2d785 (diff) | |
Merge "Move CarrierIdentifier/CarrierService to telephony"
am: 306786abd4
Change-Id: I20c8065c746f4ce025ef45ef4dc6ad0726f83b22
| -rw-r--r-- | telephony/java/android/service/carrier/CarrierIdentifier.aidl (renamed from core/java/android/service/carrier/CarrierIdentifier.aidl) | 0 | ||||
| -rw-r--r-- | telephony/java/android/service/carrier/CarrierIdentifier.java (renamed from core/java/android/service/carrier/CarrierIdentifier.java) | 0 | ||||
| -rw-r--r-- | telephony/java/android/service/carrier/CarrierService.java (renamed from core/java/android/service/carrier/CarrierService.java) | 0 | ||||
| -rw-r--r-- | telephony/java/android/service/carrier/ICarrierService.aidl (renamed from core/java/android/service/carrier/ICarrierService.aidl) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/core/java/android/service/carrier/CarrierIdentifier.aidl b/telephony/java/android/service/carrier/CarrierIdentifier.aidl index 48b13983050d..48b13983050d 100644 --- a/core/java/android/service/carrier/CarrierIdentifier.aidl +++ b/telephony/java/android/service/carrier/CarrierIdentifier.aidl diff --git a/core/java/android/service/carrier/CarrierIdentifier.java b/telephony/java/android/service/carrier/CarrierIdentifier.java index af5bf7475f95..af5bf7475f95 100644 --- a/core/java/android/service/carrier/CarrierIdentifier.java +++ b/telephony/java/android/service/carrier/CarrierIdentifier.java diff --git a/core/java/android/service/carrier/CarrierService.java b/telephony/java/android/service/carrier/CarrierService.java index eefc1b70bac9..eefc1b70bac9 100644 --- a/core/java/android/service/carrier/CarrierService.java +++ b/telephony/java/android/service/carrier/CarrierService.java diff --git a/core/java/android/service/carrier/ICarrierService.aidl b/telephony/java/android/service/carrier/ICarrierService.aidl index ac6f9614d8f5..ac6f9614d8f5 100644 --- a/core/java/android/service/carrier/ICarrierService.aidl +++ b/telephony/java/android/service/carrier/ICarrierService.aidl |