summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2017-08-02 04:41:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-02 04:41:11 +0000
commit7ac9fa687c60342466e720da8ef7a9556d45fc12 (patch)
tree729cf3b37257754bb5f6c0e8d49af119be30aeef
parent1546a94fc3f1c5a9d4f1d2eda26dd1607a09b2ef (diff)
parent6c83a6f8be8d954c0bbbdec64acc25ccb1b1e3b4 (diff)
downloadandroid_packages_apps_CellBroadcastReceiver-7ac9fa687c60342466e720da8ef7a9556d45fc12.tar.gz
android_packages_apps_CellBroadcastReceiver-7ac9fa687c60342466e720da8ef7a9556d45fc12.tar.bz2
android_packages_apps_CellBroadcastReceiver-7ac9fa687c60342466e720da8ef7a9556d45fc12.zip
Fixed configuration service not started when no SIM inserted
am: 6c83a6f8be Change-Id: I7c4160e2956b5591c97e15de76a408de6678e635
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java1
2 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 61b11ceb..e7407ac2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,6 +30,7 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.MANAGE_USERS" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<application android:name="CellBroadcastReceiverApp"
android:label="@string/app_label"
@@ -124,6 +125,7 @@
<intent-filter>
<action android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
<action android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
index 477e8be5..01208994 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
@@ -70,6 +70,7 @@ public class CellBroadcastReceiver extends BroadcastReceiver {
});
} else if (TelephonyIntents.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.equals(action)
|| CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(action)
+ || Intent.ACTION_BOOT_COMPLETED.equals(action)
|| CELLBROADCAST_START_CONFIG_ACTION.equals(action)) {
// Todo: Add the service state check once the new get service state API is done.
// Do not rely on mServiceState as it gets reset to -1 time to time because