Move connectivity-sources to frameworks/base
All sources for the connectivity module are being moved to frameworks/base/packages/Connectivity, so that they can all be moved to packages/modules/Connectivity in one move keeping history. INetworkAgent and INetworkAgentRegistry were created in packages/modules/Connectivity directly, but this makes managing the sources until the move harder as the module needs to pull sources from two different locations. Considering that they do not have history to move, just move them to frameworks/base/packages/Connectivity without the commit history. Bug: 171540887 Test: m Change-Id: Ic4353115a98b6235c2b5d5ce24741223e618d0a6
This commit is contained in:
29
framework/Android.bp
Normal file
29
framework/Android.bp
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
//
|
||||||
|
// Copyright (C) 2020 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.
|
||||||
|
//
|
||||||
|
|
||||||
|
// TODO: use a java_library in the bootclasspath instead
|
||||||
|
filegroup {
|
||||||
|
name: "framework-connectivity-sources",
|
||||||
|
srcs: [
|
||||||
|
"src/**/*.java",
|
||||||
|
"src/**/*.aidl",
|
||||||
|
],
|
||||||
|
path: "src",
|
||||||
|
visibility: [
|
||||||
|
"//frameworks/base",
|
||||||
|
"//packages/modules/Connectivity:__subpackages__",
|
||||||
|
],
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2020, 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 perNmissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package com.android.connectivity.aidl;
|
||||||
|
|
||||||
|
import android.net.NattKeepalivePacketData;
|
||||||
|
import android.net.QosFilterParcelable;
|
||||||
|
import android.net.TcpKeepalivePacketData;
|
||||||
|
|
||||||
|
import com.android.connectivity.aidl.INetworkAgentRegistry;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface to notify NetworkAgent of connectivity events.
|
||||||
|
* @hide
|
||||||
|
*/
|
||||||
|
oneway interface INetworkAgent {
|
||||||
|
void onRegistered(in INetworkAgentRegistry registry);
|
||||||
|
void onDisconnected();
|
||||||
|
void onBandwidthUpdateRequested();
|
||||||
|
void onValidationStatusChanged(int validationStatus,
|
||||||
|
in @nullable String captivePortalUrl);
|
||||||
|
void onSaveAcceptUnvalidated(boolean acceptUnvalidated);
|
||||||
|
void onStartNattSocketKeepalive(int slot, int intervalDurationMs,
|
||||||
|
in NattKeepalivePacketData packetData);
|
||||||
|
void onStartTcpSocketKeepalive(int slot, int intervalDurationMs,
|
||||||
|
in TcpKeepalivePacketData packetData);
|
||||||
|
void onStopSocketKeepalive(int slot);
|
||||||
|
void onSignalStrengthThresholdsUpdated(in int[] thresholds);
|
||||||
|
void onPreventAutomaticReconnect();
|
||||||
|
void onAddNattKeepalivePacketFilter(int slot,
|
||||||
|
in NattKeepalivePacketData packetData);
|
||||||
|
void onAddTcpKeepalivePacketFilter(int slot,
|
||||||
|
in TcpKeepalivePacketData packetData);
|
||||||
|
void onRemoveKeepalivePacketFilter(int slot);
|
||||||
|
void onQosFilterCallbackRegistered(int qosCallbackId, in QosFilterParcelable filterParcel);
|
||||||
|
void onQosCallbackUnregistered(int qosCallbackId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2020, 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 perNmissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package com.android.connectivity.aidl;
|
||||||
|
|
||||||
|
import android.net.LinkProperties;
|
||||||
|
import android.net.Network;
|
||||||
|
import android.net.NetworkCapabilities;
|
||||||
|
import android.net.NetworkInfo;
|
||||||
|
import android.net.QosSession;
|
||||||
|
import android.telephony.data.EpsBearerQosSessionAttributes;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface for NetworkAgents to send network network properties.
|
||||||
|
* @hide
|
||||||
|
*/
|
||||||
|
oneway interface INetworkAgentRegistry {
|
||||||
|
void sendNetworkCapabilities(in NetworkCapabilities nc);
|
||||||
|
void sendLinkProperties(in LinkProperties lp);
|
||||||
|
// TODO: consider replacing this by "markConnected()" and removing
|
||||||
|
void sendNetworkInfo(in NetworkInfo info);
|
||||||
|
void sendScore(int score);
|
||||||
|
void sendExplicitlySelected(boolean explicitlySelected, boolean acceptPartial);
|
||||||
|
void sendSocketKeepaliveEvent(int slot, int reason);
|
||||||
|
void sendUnderlyingNetworks(in @nullable List<Network> networks);
|
||||||
|
void sendEpsQosSessionAvailable(int callbackId, in QosSession session, in EpsBearerQosSessionAttributes attributes);
|
||||||
|
void sendQosSessionLost(int qosCallbackId, in QosSession session);
|
||||||
|
void sendQosCallbackError(int qosCallbackId, int exceptionType);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user