diff options
| author | Meng Wang <mewan@google.com> | 2019-11-27 21:23:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-27 21:23:31 +0000 |
| commit | 306786abd496f026a03312162a208df35fa2d785 (patch) | |
| tree | 2d40371036aff469d21c8363e8de94f933970d45 | |
| parent | 4d0df870cd052c995d3938b39a86140dd5b73e36 (diff) | |
| parent | a9ed60663673867c9972c2065fe4d5e622acdf88 (diff) | |
Merge "Move CarrierIdentifier/CarrierService to telephony"
| -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 |