am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev

* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
  Created Multi-SIM notifications.
This commit is contained in:
PauloftheWest
2014-11-18 20:17:50 +00:00
committed by Android Git Automerger
10 changed files with 157 additions and 1 deletions

View File

@@ -66,6 +66,7 @@
<uses-permission android:name="android.permission.SET_TIME" />
<uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
<uses-permission android:name="android.permission.REBOOT" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
<uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
<uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
@@ -1978,6 +1979,12 @@
</intent-filter>
</receiver>
<receiver android:name=".sim.SimBootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
</intent-filter>
</receiver>
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.android.settings.files"