From 106069412da3edd7de44f616a4f876d7102dcb45 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Wed, 30 Mar 2016 18:52:40 +0100
Subject: [PATCH] Move UidRange aidl declaration to system/netd

Which owns the native UidRange.cpp, so it makes more sense for the
declaration to live there since frameworks/base depends on netd but not
vice versa.

Bug: 26694104
Change-Id: I0efda77713ee6f0ec8070fb0e09a694b95f6cd25
---
 Android.mk                          |  4 +++-
 core/java/android/net/UidRange.aidl | 24 ------------------------
 services/core/Android.mk            |  3 +++
 3 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 core/java/android/net/UidRange.aidl

diff --git a/Android.mk b/Android.mk
index ae5d67ed2de3..3cd2aa02a5df 100644
--- a/Android.mk
+++ b/Android.mk
@@ -474,7 +474,8 @@ LOCAL_AIDL_INCLUDES += \
 
 LOCAL_AIDL_INCLUDES += \
 	frameworks/av/camera/aidl \
-	frameworks/native/aidl/gui
+	frameworks/native/aidl/gui \
+	system/netd/server/binder
 
 LOCAL_INTERMEDIATE_SOURCES := \
 			$(framework_res_source_path)/android/R.java \
@@ -690,6 +691,7 @@ aidl_files := \
 	frameworks/base/core/java/android/database/CursorWindow.aidl \
 	frameworks/base/core/java/android/service/quicksettings/Tile.aidl \
 	frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \
+	system/netd/server/binder/android/net/UidRange.aidl \
 
 gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
 $(gen): PRIVATE_SRC_FILES := $(aidl_files)
diff --git a/core/java/android/net/UidRange.aidl b/core/java/android/net/UidRange.aidl
deleted file mode 100644
index f9be628c1673..000000000000
--- a/core/java/android/net/UidRange.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-/**
- * An inclusive range of UIDs.
- *
- * {@hide}
- */
-parcelable UidRange;
diff --git a/services/core/Android.mk b/services/core/Android.mk
index 99c5dd69cda3..fc35dc284611 100644
--- a/services/core/Android.mk
+++ b/services/core/Android.mk
@@ -10,6 +10,9 @@ LOCAL_SRC_FILES += \
     java/com/android/server/am/EventLogTags.logtags \
     ../../../../system/netd/server/binder/android/net/INetd.aidl
 
+LOCAL_AIDL_INCLUDES += \
+    system/netd/server/binder
+
 LOCAL_JAVA_LIBRARIES := services.net telephony-common
 LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update
 
-- 
2.11.0