Merge "Ims: Align ConfURIDialer with AOSP"
diff --git a/internal/src/org/codeaurora/internal/ServiceUtil.java b/internal/src/org/codeaurora/internal/ServiceUtil.java
index 8182c1a..a7001c6 100644
--- a/internal/src/org/codeaurora/internal/ServiceUtil.java
+++ b/internal/src/org/codeaurora/internal/ServiceUtil.java
@@ -42,7 +42,7 @@
private ServiceUtil() {}
static public boolean bindService(Context context, ServiceConnection connection) {
- IBinder extTelephony = ServiceManager.getService("extphone");
+ IBinder extTelephony = ServiceManager.getService("qti.radio.extphone");
boolean success = (extTelephony != null)? true: false;
diff --git a/qti-hidl-wrapper/Android.bp b/qti-hidl-wrapper/Android.bp
index 05c047c..6e1f38e 100644
--- a/qti-hidl-wrapper/Android.bp
+++ b/qti-hidl-wrapper/Android.bp
@@ -3,7 +3,8 @@
name: "qti-telephony-hidl-wrapper",
installable: true,
- product_specific: true,
+ system_ext_specific: true,
+ sdk_version: "system_current",
static_libs: [
"android.hidl.base-V1.0-java",
@@ -18,9 +19,9 @@
name: "qti_telephony_hidl_wrapper.xml",
- // This will install the file in /product/etc/permissions
+ // This will install the file in /system_ext/etc/permissions
src: "qti_telephony_hidl_wrapper.xml",
sub_dir: "permissions",
- product_specific: true,
+ system_ext_specific: true,
}
diff --git a/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml b/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml
index dc9ba2c..ccf6358 100644
--- a/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml
+++ b/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml
@@ -31,5 +31,5 @@
<permissions>
<library name="qti-telephony-hidl-wrapper"
- file="/product/framework/qti-telephony-hidl-wrapper.jar"/>
+ file="/system_ext/framework/qti-telephony-hidl-wrapper.jar"/>
</permissions>
diff --git a/qti-utils/Android.bp b/qti-utils/Android.bp
index 51d3fdf..6e3e9de 100644
--- a/qti-utils/Android.bp
+++ b/qti-utils/Android.bp
@@ -2,9 +2,13 @@
java_library {
name: "qti-telephony-utils",
installable: true,
+ sdk_version: "system_current",
srcs: ["src/org/**/*.java"],
- product_specific: true,
+ system_ext_specific: true,
+ libs: [
+ "androidx.annotation_annotation"
+ ],
}
@@ -14,11 +18,11 @@
name: "qti_telephony_utils.xml",
- // This will install the file in /product/etc/permissions
+ // This will install the file in /system_ext/etc/permissions
//
src: "qti_telephony_utils.xml",
sub_dir: "permissions",
- product_specific: true,
+ system_ext_specific: true,
-}
\ No newline at end of file
+}
diff --git a/qti-utils/qti_telephony_utils.xml b/qti-utils/qti_telephony_utils.xml
index e2820fc..8b9736b 100644
--- a/qti-utils/qti_telephony_utils.xml
+++ b/qti-utils/qti_telephony_utils.xml
@@ -29,5 +29,5 @@
-->
<permissions>
<library name="qti-telephony-utils"
- file="/product/framework/qti-telephony-utils.jar"/>
+ file="/system_ext/framework/qti-telephony-utils.jar"/>
</permissions>
diff --git a/qti-utils/src/org/codeaurora/utils/Preconditions.java b/qti-utils/src/org/codeaurora/utils/Preconditions.java
index 5b6c4ff..0d66783 100644
--- a/qti-utils/src/org/codeaurora/utils/Preconditions.java
+++ b/qti-utils/src/org/codeaurora/utils/Preconditions.java
@@ -21,8 +21,8 @@
package org.codeaurora.telephony.utils;
-import android.annotation.IntRange;
-import android.annotation.NonNull;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
import android.text.TextUtils;
import java.util.Collection;
diff --git a/qti-utils/src/org/codeaurora/utils/SntpClient.java b/qti-utils/src/org/codeaurora/utils/SntpClient.java
index 301b2af..6504178 100644
--- a/qti-utils/src/org/codeaurora/utils/SntpClient.java
+++ b/qti-utils/src/org/codeaurora/utils/SntpClient.java
@@ -26,8 +26,6 @@
import android.net.TrafficStats;
import android.util.Log;
-import com.android.internal.util.TrafficStatsConstants;
-
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
diff --git a/qti-utils/src/org/codeaurora/utils/TrafficStatsConstants.java b/qti-utils/src/org/codeaurora/utils/TrafficStatsConstants.java
new file mode 100644
index 0000000..6c980fa
--- /dev/null
+++ b/qti-utils/src/org/codeaurora/utils/TrafficStatsConstants.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 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 org.codeaurora.telephony.utils;
+
+/**
+ * Constants for traffic stats.
+ */
+public class TrafficStatsConstants {
+ // These tags are used by the network stack to do traffic for its own purposes. Traffic
+ // tagged with these will be counted toward the network stack and must stay inside the
+ // range defined by
+ // {@link android.net.TrafficStats#TAG_NETWORK_STACK_RANGE_START} and
+ // {@link android.net.TrafficStats#TAG_NETWORK_STACK_RANGE_END}.
+ public static final int TAG_SYSTEM_DHCP = 0xFFFFFE01;
+ public static final int TAG_SYSTEM_NEIGHBOR = 0xFFFFFE02;
+ public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFE03;
+
+ public static final int TAG_SYSTEM_NTP = 0xFFFFFF41;
+ public static final int TAG_SYSTEM_GPS = 0xFFFFFF44;
+ public static final int TAG_SYSTEM_PAC = 0xFFFFFF45;
+
+ // These tags are used by the network stack to do traffic on behalf of apps. Traffic
+ // tagged with these will be counted toward the app on behalf of which the network
+ // stack is doing this traffic. These values must stay inside the range defined by
+ // {@link android.net.TrafficStats#TAG_NETWORK_STACK_IMPERSONATION_RANGE_START} and
+ // {@link android.net.TrafficStats#TAG_NETWORK_STACK_IMPERSONATION_RANGE_END}.
+ public static final int TAG_SYSTEM_PROBE = 0xFFFFFF81;
+ public static final int TAG_SYSTEM_DNS = 0xFFFFFF82;
+}
+