Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a77a0aa2 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Add Qos Callback files" am: d3464463 am: 82009d69 am: d33e21d0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2230e75cf710d5c9203eca741bb6abb662c96bbc
parents 8357d23b d33e21d0

services/core/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -226,6 +226,8 @@ filegroup { 
        "java/com/android/server/connectivity/NetworkRanker.java",

        "java/com/android/server/connectivity/NetworkRanker.java",

        "java/com/android/server/connectivity/PermissionMonitor.java",

        "java/com/android/server/connectivity/PermissionMonitor.java",

        "java/com/android/server/connectivity/ProxyTracker.java",

        "java/com/android/server/connectivity/ProxyTracker.java",

        "java/com/android/server/connectivity/QosCallbackAgentConnection.java",

        "java/com/android/server/connectivity/QosCallbackTracker.java",

        "java/com/android/server/connectivity/TcpKeepaliveController.java",

        "java/com/android/server/connectivity/TcpKeepaliveController.java",

        "java/com/android/server/connectivity/Vpn.java",

        "java/com/android/server/connectivity/Vpn.java",

        "java/com/android/server/connectivity/VpnIkev2Utils.java",

        "java/com/android/server/connectivity/VpnIkev2Utils.java",

services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 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 com.android.server.connectivity;



class QosCallbackAgentConnection {

}

services/core/java/com/android/server/connectivity/QosCallbackTracker.java

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 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 com.android.server.connectivity;



class QosCallbackTracker {

}