invisiblek

diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 18959c7..1eb409b 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -160,8 +160,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
         mVolume = mStorageManager.findVolumeById(mVolumeId);
 
         final long sharedDataSize = mVolume.getPath().getTotalSpace();
-        boolean isInternal = VolumeInfo.ID_PRIVATE_INTERNAL.equals(mVolume.getId());
-        mTotalSize = isInternal ? getArguments().getLong(EXTRA_VOLUME_SIZE, 0) : sharedDataSize;

invisiblek

diff --git a/res/values/bools.xml b/res/values/bools.xml
index 20b8c54..48f12b6 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -50,6 +50,9 @@
     <!-- Whether none security option is hide or not  (country specific). -->
     <bool name="config_hide_none_security_option">false</bool>
 
+    <!--Whether help links are defined. -->
+    <bool name="config_has_help">false</bool>

invisiblek

d android_build https://gist.github.com/00aad598f21adabea5295a311796e7d8
d android_frameworks_opt_net_ims Error: Cannot gist empty files
d android_frameworks_native Error: Cannot gist empty files
d android_frameworks_opt_net_wifi Error: Cannot gist empty files
d android_frameworks_av https://gist.github.com/6ac5e56cebe7db75fbfd183c9a814600
d android_frameworks_opt_telephony https://gist.github.com/b8a61e9ae37b47c9a235463520da2ca6
d android_hardware_qcom_audio Error: Cannot gist empty files
d android_hardware_qcom_display Error: Cannot gist empty files
d android_hardware_qcom_media Error: Cannot gist empty files
d android_packages_apps_Bluetooth https://gist.github.com/b2e73ac728d41f63861b48dba18c60ea

invisiblek

diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c
index afbf26d..7e9b495 100644
--- a/fs_mgr/fs_mgr_fstab.c
+++ b/fs_mgr/fs_mgr_fstab.c
@@ -79,8 +79,8 @@ static struct flag_list fs_mgr_flags[] = {
     { "formattable", MF_FORMATTABLE },
     { "slotselect",  MF_SLOTSELECT },
     { "nofail",      MF_NOFAIL },
-    { "zramstreams=",MF_ZRAMSTREAMS },
     { "latemount",   MF_LATEMOUNT },

invisiblek

diff --git a/stack/l2cap/l2c_ble.c b/stack/l2cap/l2c_ble.c
index 0682db0..c36452d 100644
--- a/stack/l2cap/l2c_ble.c
+++ b/stack/l2cap/l2c_ble.c
@@ -298,13 +298,13 @@ void l2cble_notify_le_connection (BD_ADDR bda)
     if (p_lcb == NULL) {
         L2CAP_TRACE_ERROR("%s, link control block is null", __func__);
         return;
-    }
-

invisiblek

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 96a48b9..e908bf2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -414,6 +414,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="CellBroadcastSms"
+            android:label="@string/cell_broadcast_sms"

invisiblek

diff --git a/src/com/android/server/telecom/Ringer.java b/src/com/android/server/telecom/Ringer.java
index f53f212..3ce3c16 100644
--- a/src/com/android/server/telecom/Ringer.java
+++ b/src/com/android/server/telecom/Ringer.java
@@ -117,12 +117,13 @@ public class Ringer {
 
         stopCallWaiting();
 
-        boolean[] shouldRingOrVibrate =
-                shouldRingOrVibrateForContact(foregroundCall.getContactUri());

invisiblek

diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index ed13c08..01f887c 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -311,5 +311,6 @@ interface IDevicePolicyManager {
 
     void setBackupServiceEnabled(in ComponentName admin, boolean enabled);
     boolean isBackupServiceEnabled(in ComponentName admin);
+
     boolean requireSecureKeyguard(int userHandle);

invisiblek

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d406021..30aad01 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -96,6 +96,14 @@
             </intent-filter>
         </activity>
 
+        <!-- Full-screen version of CellBroadcastAlertDialog to display alerts over lock screen. -->
+        <activity android:name="CellBroadcastAlertFullScreen"

invisiblek

diff --git a/assets/carrier_config_302220.xml b/assets/carrier_config_302220.xml
index 4cf539a..477d2da 100644
--- a/assets/carrier_config_302220.xml
+++ b/assets/carrier_config_302220.xml
@@ -11,12 +11,12 @@
         <string-array name="read_only_apn_types_string_array" num="1">
             <item value="*" />
         </string-array>
-<string-array name="gsm_nonroaming_networks_string_array" num="5">
-    <item value="302370" />