diff --git a/api/cm_current.txt b/api/cm_current.txt
index a987ec1..223d7f4 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -621,11 +621,13 @@ package cyanogenmod.platform {
     field public static final java.lang.String PROTECTED_APP = "cyanogenmod.permission.PROTECTED_APP";
     field public static final java.lang.String PUBLISH_CUSTOM_TILE = "cyanogenmod.permission.PUBLISH_CUSTOM_TILE";
     field public static final java.lang.String READ_ALARMS = "cyanogenmod.permission.READ_ALARMS";
+    field public static final java.lang.String READ_DATAUSAGE = "cyanogenmod.permission.READ_DATAUSAGE";
     field public static final java.lang.String READ_MSIM_PHONE_STATE = "cyanogenmod.permission.READ_MSIM_PHONE_STATE";
     field public static final java.lang.String READ_THEMES = "cyanogenmod.permission.READ_THEMES";
     field public static final java.lang.String READ_WEATHER = "cyanogenmod.permission.READ_WEATHER";
     field public static final java.lang.String THIRD_PARTY_KEYGUARD = "android.permission.THIRD_PARTY_KEYGUARD";
     field public static final java.lang.String WRITE_ALARMS = "cyanogenmod.permission.WRITE_ALARMS";
+    field public static final java.lang.String WRITE_DATAUSAGE = "cyanogenmod.permission.WRITE_DATAUSAGE";
     field public static final java.lang.String WRITE_SECURE_SETTINGS = "cyanogenmod.permission.WRITE_SECURE_SETTINGS";
     field public static final java.lang.String WRITE_SETTINGS = "cyanogenmod.permission.WRITE_SETTINGS";
     field public static final java.lang.String WRITE_THEMES = "cyanogenmod.permission.WRITE_THEMES";
@@ -791,6 +793,7 @@ package cyanogenmod.providers {
 
   public final class CMSettings {
     ctor public CMSettings();
+    field public static final java.lang.String ACTION_DATA_USAGE = "cyanogenmod.settings.ACTION_DATA_USAGE";
     field public static final java.lang.String AUTHORITY = "cmsettings";
   }
 
@@ -939,6 +942,39 @@ package cyanogenmod.providers {
     field public static final java.lang.String ZEN_PRIORITY_ALLOW_LIGHTS = "zen_priority_allow_lights";
   }
 
+  public final class DataUsageContract {
+    ctor public DataUsageContract();
+    field public static final java.lang.String ACTIVE = "active";
+    field public static final android.net.Uri BASE_CONTENT_URI;
+    field public static final java.lang.String BYTES = "bytes";
+    field public static final int COLUMN_OF_ACTIVE = 3; // 0x3
+    field public static final int COLUMN_OF_BYTES = 5; // 0x5
+    field public static final int COLUMN_OF_ENABLE = 2; // 0x2
+    field public static final int COLUMN_OF_EXTRA = 10; // 0xa
+    field public static final int COLUMN_OF_FAST_AVG = 8; // 0x8
+    field public static final int COLUMN_OF_FAST_SAMPLES = 9; // 0x9
+    field public static final int COLUMN_OF_ID = 0; // 0x0
+    field public static final int COLUMN_OF_LABEL = 4; // 0x4
+    field public static final int COLUMN_OF_SLOW_AVG = 6; // 0x6
+    field public static final int COLUMN_OF_SLOW_SAMPLES = 7; // 0x7
+    field public static final int COLUMN_OF_UID = 1; // 0x1
+    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.itemdatausage_item";
+    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dirdatausage_item";
+    field public static final android.net.Uri CONTENT_URI;
+    field public static final java.lang.String DATAUSAGE_AUTHORITY = "org.cyanogenmod.providers.datausage";
+    field public static final java.lang.String DATAUSAGE_TABLE = "datausage";
+    field public static final java.lang.String ENABLE = "enable";
+    field public static final java.lang.String EXTRA = "extra";
+    field public static final java.lang.String FAST_AVG = "fast_avg";
+    field public static final java.lang.String FAST_SAMPLES = "fast_samples";
+    field public static final java.lang.String LABEL = "label";
+    field public static final java.lang.String[] PROJECTION_ALL;
+    field public static final java.lang.String SLOW_AVG = "slow_avg";
+    field public static final java.lang.String SLOW_SAMPLES = "slow_samples";
+    field public static final java.lang.String UID = "uid";
+    field public static final java.lang.String _ID = "_id";
+  }
+
   public class ThemesContract {
     ctor public ThemesContract();
     field public static final java.lang.String AUTHORITY = "com.cyanogenmod.themes";
diff --git a/cm/res/AndroidManifest.xml b/cm/res/AndroidManifest.xml
index b403d1e..3565673 100644
--- a/cm/res/AndroidManifest.xml
+++ b/cm/res/AndroidManifest.xml
@@ -227,4 +227,16 @@
                  android:killAfterRestore="false"
                  android:supportsRtl="true"/>
 
+    <!-- Permission for reading the DataUsage database -->
+    <permission android:name="cyanogenmod.permission.READ_DATAUSAGE"
+                android:label="@string/permlab_dataUsageRead"
+                android:description="@string/permdesc_dataUsageRead"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- Permission for writing the DataUsage database -->
+    <permission android:name="cyanogenmod.permission.WRITE_DATAUSAGE"
+                android:label="@string/permlab_dataUsageWrite"
+                android:description="@string/permdesc_dataUsageWrite"
+                android:protectionLevel="signature|privileged" />
+
 </manifest>
diff --git a/cm/res/res/values/strings.xml b/cm/res/res/values/strings.xml
index 887062f..aa0d0de 100644
--- a/cm/res/res/values/strings.xml
+++ b/cm/res/res/values/strings.xml
@@ -188,4 +188,14 @@
     <string name="permdesc_weather_bind">Allows an app to be identified as a weather provider service.</string>
     <string name="permlab_weather_access_mgr">access weather service</string>
     <string name="permdesc_weather_access_mgr">Allows an app to access the weather service in the system. Should never be needed for normal apps.</string>
+
+    <!-- DataUsageProvider write permission title -->
+    <string name="permlab_dataUsageWrite">modify data usage db</string>
+    <!-- DataUsageProvider write permission description -->
+    <string name="permdesc_dataUsageWrite">Allows write access to the DataUsage db</string>
+
+    <!-- DataUsageProvider read permission title -->
+    <string name="permlab_dataUsageRead">read data usage db</string>
+    <!-- DataUsageProvider read permission description -->
+    <string name="permdesc_dataUsageRead">Allows read access to the DataUsage db</string>
 </resources>
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index a987ec1..223d7f4 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -621,11 +621,13 @@ package cyanogenmod.platform {
     field public static final java.lang.String PROTECTED_APP = "cyanogenmod.permission.PROTECTED_APP";
     field public static final java.lang.String PUBLISH_CUSTOM_TILE = "cyanogenmod.permission.PUBLISH_CUSTOM_TILE";
     field public static final java.lang.String READ_ALARMS = "cyanogenmod.permission.READ_ALARMS";
+    field public static final java.lang.String READ_DATAUSAGE = "cyanogenmod.permission.READ_DATAUSAGE";
     field public static final java.lang.String READ_MSIM_PHONE_STATE = "cyanogenmod.permission.READ_MSIM_PHONE_STATE";
     field public static final java.lang.String READ_THEMES = "cyanogenmod.permission.READ_THEMES";
     field public static final java.lang.String READ_WEATHER = "cyanogenmod.permission.READ_WEATHER";
     field public static final java.lang.String THIRD_PARTY_KEYGUARD = "android.permission.THIRD_PARTY_KEYGUARD";
     field public static final java.lang.String WRITE_ALARMS = "cyanogenmod.permission.WRITE_ALARMS";
+    field public static final java.lang.String WRITE_DATAUSAGE = "cyanogenmod.permission.WRITE_DATAUSAGE";
     field public static final java.lang.String WRITE_SECURE_SETTINGS = "cyanogenmod.permission.WRITE_SECURE_SETTINGS";
     field public static final java.lang.String WRITE_SETTINGS = "cyanogenmod.permission.WRITE_SETTINGS";
     field public static final java.lang.String WRITE_THEMES = "cyanogenmod.permission.WRITE_THEMES";
@@ -791,6 +793,7 @@ package cyanogenmod.providers {
 
   public final class CMSettings {
     ctor public CMSettings();
+    field public static final java.lang.String ACTION_DATA_USAGE = "cyanogenmod.settings.ACTION_DATA_USAGE";
     field public static final java.lang.String AUTHORITY = "cmsettings";
   }
 
@@ -939,6 +942,39 @@ package cyanogenmod.providers {
     field public static final java.lang.String ZEN_PRIORITY_ALLOW_LIGHTS = "zen_priority_allow_lights";
   }
 
+  public final class DataUsageContract {
+    ctor public DataUsageContract();
+    field public static final java.lang.String ACTIVE = "active";
+    field public static final android.net.Uri BASE_CONTENT_URI;
+    field public static final java.lang.String BYTES = "bytes";
+    field public static final int COLUMN_OF_ACTIVE = 3; // 0x3
+    field public static final int COLUMN_OF_BYTES = 5; // 0x5
+    field public static final int COLUMN_OF_ENABLE = 2; // 0x2
+    field public static final int COLUMN_OF_EXTRA = 10; // 0xa
+    field public static final int COLUMN_OF_FAST_AVG = 8; // 0x8
+    field public static final int COLUMN_OF_FAST_SAMPLES = 9; // 0x9
+    field public static final int COLUMN_OF_ID = 0; // 0x0
+    field public static final int COLUMN_OF_LABEL = 4; // 0x4
+    field public static final int COLUMN_OF_SLOW_AVG = 6; // 0x6
+    field public static final int COLUMN_OF_SLOW_SAMPLES = 7; // 0x7
+    field public static final int COLUMN_OF_UID = 1; // 0x1
+    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.itemdatausage_item";
+    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dirdatausage_item";
+    field public static final android.net.Uri CONTENT_URI;
+    field public static final java.lang.String DATAUSAGE_AUTHORITY = "org.cyanogenmod.providers.datausage";
+    field public static final java.lang.String DATAUSAGE_TABLE = "datausage";
+    field public static final java.lang.String ENABLE = "enable";
+    field public static final java.lang.String EXTRA = "extra";
+    field public static final java.lang.String FAST_AVG = "fast_avg";
+    field public static final java.lang.String FAST_SAMPLES = "fast_samples";
+    field public static final java.lang.String LABEL = "label";
+    field public static final java.lang.String[] PROJECTION_ALL;
+    field public static final java.lang.String SLOW_AVG = "slow_avg";
+    field public static final java.lang.String SLOW_SAMPLES = "slow_samples";
+    field public static final java.lang.String UID = "uid";
+    field public static final java.lang.String _ID = "_id";
+  }
+
   public class ThemesContract {
     ctor public ThemesContract();
     field public static final java.lang.String AUTHORITY = "com.cyanogenmod.themes";