diff options
| -rw-r--r-- | AndroidManifest.xml | 19 | ||||
| -rw-r--r-- | AndroidManifestBase.xml | 9 | ||||
| -rw-r--r-- | src/android/net/metrics/DataStallStatsUtils.java | 11 | ||||
| -rw-r--r-- | tests/Android.bp | 2 |
4 files changed, 29 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b0a7923..8d8e222 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,9 +17,24 @@ */ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.networkstack" - android:sharedUserId="android.uid.networkstack"> + package="com.android.networkstack" + android:sharedUserId="android.uid.networkstack" + android:versionCode="200000000" + android:versionName="29 system image" +> + <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> + + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> + <!-- Send latency broadcast as current user --> + <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> + <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> + <!-- Signature permission defined in NetworkStackStub --> <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" /> <application> diff --git a/AndroidManifestBase.xml b/AndroidManifestBase.xml index f69e4b2..69a4da4 100644 --- a/AndroidManifestBase.xml +++ b/AndroidManifestBase.xml @@ -20,15 +20,6 @@ package="com.android.networkstack" android:versionCode="11" android:versionName="Q-initial"> - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> - <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> - <!-- Send latency broadcast as current user --> - <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> - <uses-permission android:name="android.permission.WAKE_LOCK" /> - <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> <application android:label="NetworkStack" android:defaultToDeviceProtectedStorage="true" diff --git a/src/android/net/metrics/DataStallStatsUtils.java b/src/android/net/metrics/DataStallStatsUtils.java index c96411e..e23f10f 100644 --- a/src/android/net/metrics/DataStallStatsUtils.java +++ b/src/android/net/metrics/DataStallStatsUtils.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.net.captiveportal.CaptivePortalProbeResult; import android.util.Log; +import android.util.StatsLog; import com.android.internal.util.HexDump; import com.android.server.connectivity.nano.DataStallEventProto; @@ -36,6 +37,7 @@ import com.android.server.connectivity.nano.DataStallEventProto; */ public class DataStallStatsUtils { private static final String TAG = DataStallStatsUtils.class.getSimpleName(); + private static final int DATA_STALL_EVENT_ID = 121; private static final boolean DBG = false; private static int probeResultToEnum(@Nullable final CaptivePortalProbeResult result) { @@ -63,6 +65,13 @@ public class DataStallStatsUtils { Log.d(TAG, "write: " + stats + " with result: " + validationResult + ", dns: " + HexDump.toHexString(stats.mDns)); } - // TODO(b/124613085): Send to Statsd once the public StatsLog API is ready. + // TODO(b/124613085): Update API once the public StatsLog API is ready. + StatsLog.write(DATA_STALL_EVENT_ID, + stats.mEvaluationType, + validationResult, + stats.mNetworkType, + stats.mWifiInfo, + stats.mCellularInfo, + stats.mDns); } } diff --git a/tests/Android.bp b/tests/Android.bp index aadf99e..0535af3 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -45,6 +45,8 @@ android_test { "libcrypto", "libcutils", "libdexfile", + "ld-android", + "libdl_android", "libhidl-gen-utils", "libhidlbase", "libhidltransport", |