diff options
| author | Steven Moreland <smoreland@google.com> | 2020-10-02 18:23:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-02 18:23:31 +0000 |
| commit | 21b0d25ba8538095259699f77514c0c41cd91cee (patch) | |
| tree | 045c3da2ab0ffc84e0369c13e6dcd5614bfd7a16 | |
| parent | 86a94de69a1080851ee8446dec882d6695e423fe (diff) | |
| parent | e143e071d17a9cb39e461ad51616d02b9f9691e4 (diff) | |
Merge "Move AIDL files to declared packages." am: 1f125fcd66 am: 66f6e3d77e am: 89d60ad686 am: e143e071d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445648
Change-Id: I089b2f50a38e05c785de35b41363b809c823caa7
| -rw-r--r-- | core/java/com/android/ims/internal/uce/presence/PresCmdID.aidl (renamed from core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl) | 0 | ||||
| -rw-r--r-- | wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl | 2 | ||||
| -rw-r--r-- | wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl b/core/java/com/android/ims/internal/uce/presence/PresCmdID.aidl index 6ece045ffcf7..6ece045ffcf7 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl +++ b/core/java/com/android/ims/internal/uce/presence/PresCmdID.aidl diff --git a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl index cf2cb4ae5eb4..57055f78d03d 100644 --- a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl +++ b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package android.net.wifi.p2p.servicediscovery; +package android.net.wifi.p2p.nsd; parcelable WifiP2pServiceInfo; diff --git a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl index d5a1e8f505a9..e4d28bb2d39f 100644 --- a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl +++ b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package android.net.wifi.p2p.servicediscovery; +package android.net.wifi.p2p.nsd; parcelable WifiP2pServiceRequest; |