diff options
| author | 2020-10-02 16:58:15 +0000 | |
|---|---|---|
| committer | 2020-10-02 16:58:15 +0000 | |
| commit | 66f6e3d77ee5df419fc4ed336f42b7c8783cbcb7 (patch) | |
| tree | 91382224e4c27fd82c0cce25d76c8933900b9cb9 | |
| parent | 1cb565ec3c2548b843ebeeb6d77e200ed9382fb7 (diff) | |
| parent | 1f125fcd66e13c8c4f9642425902c9d54970dcd2 (diff) | |
Merge "Move AIDL files to declared packages." am: 1f125fcd66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445648
Change-Id: Ic242d4f6e5808af93d97729b8906c2a62a6de94c
| -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; |