Merge "app link handling under restricted mobile data" into oc-dr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 93829ed..0539c2d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -63,6 +63,7 @@
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED" />
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE" />
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_RESET" />
+ <protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE" />
<protected-broadcast android:name= "com.android.internal.provider.action.VOICEMAIL_SMS_RECEIVED" />
<protected-broadcast android:name= "com.android.intent.isim_refresh" />
<protected-broadcast android:name= "com.android.ims.IMS_SERVICE_UP" />
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9b96300..b62a9d1 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3797,6 +3797,30 @@
}
/**
+ * Action set from carrier signalling broadcast receivers to start/stop reporting the default
+ * network status based on which carrier apps could apply actions accordingly,
+ * enable/disable default url handler for example.
+ *
+ * @param subId the subscription ID that this action applies to.
+ * @param report control start/stop reporting the default network status.
+ * {@hide}
+ */
+ @Override
+ public void carrierActionReportDefaultNetworkStatus(int subId, boolean report) {
+ enforceModifyPermission();
+ final Phone phone = getPhone(subId);
+ if (phone == null) {
+ loge("carrierAction: ReportDefaultNetworkStatus fails with invalid sibId: " + subId);
+ return;
+ }
+ try {
+ phone.carrierActionReportDefaultNetworkStatus(report);
+ } catch (Exception e) {
+ Log.e(LOG_TAG, "carrierAction: ReportDefaultNetworkStatus fails. Exception ex=" + e);
+ }
+ }
+
+ /**
* Called when "adb shell dumpsys phone" is invoked. Dump is also automatically invoked when a
* bug report is being generated.
*/
