diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 15 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 3 |
3 files changed, 19 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6f2002415656..7699da70405f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -397,6 +397,7 @@ <protected-broadcast android:name="com.android.settings.location.MODE_CHANGING" /> <protected-broadcast android:name="ScheduleConditionProvider.EVALUATE" /> + <protected-broadcast android:name="EventConditionProvider.EVALUATE" /> <protected-broadcast android:name="wifi_scan_available" /> <protected-broadcast android:name="action.cne.started" /> @@ -428,6 +429,20 @@ <protected-broadcast android:name="android.intent.action.ACTION_RADIO_OFF" /> <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNLOCKED" /> + <protected-broadcast android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" /> + <protected-broadcast android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" /> + + <protected-broadcast android:name="com.android.phone.SIP_INCOMING_CALL" /> + <protected-broadcast android:name="com.android.phone.SIP_ADD_PHONE" /> + <protected-broadcast android:name="com.android.phone.SIP_REMOVE_PHONE" /> + <protected-broadcast android:name="com.android.phone.SIP_CALL_OPTION_CHANGED" /> + + <protected-broadcast android:name="android.bluetooth.adapter.action.BLE_ACL_CONNECTED" /> + <protected-broadcast android:name="android.bluetooth.adapter.action.BLE_ACL_DISCONNECTED" /> + + <protected-broadcast android:name="android.bluetooth.input.profile.action.HANDSHAKE" /> + <protected-broadcast android:name="android.bluetooth.input.profile.action.REPORT" /> + <!-- ====================================================================== --> <!-- RUNTIME PERMISSIONS --> <!-- ====================================================================== --> diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 50619015bff9..60946ecc69d4 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -16934,6 +16934,8 @@ public final class ActivityManagerService extends ActivityManagerNative if (isProtectedBroadcast || Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action) || Intent.ACTION_MEDIA_SCANNER_SCAN_FILE.equals(action) + || Intent.ACTION_GET_PERMISSIONS_COUNT.equals(action) + || Intent.ACTION_GET_PERMISSIONS_PACKAGES.equals(action) || AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action) || AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action) || LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action)) { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index cc44f709b729..1a093f43d2c7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4243,7 +4243,8 @@ public class PackageManagerService extends IPackageManager.Stub { } else if (actionName != null) { // TODO: remove these terrible hacks if (actionName.startsWith("android.net.netmon.lingerExpired") - || actionName.startsWith("com.android.server.sip.SipWakeupTimer")) { + || actionName.startsWith("com.android.server.sip.SipWakeupTimer") + || actionName.startsWith("com.android.internal.telephony.data-reconnect")) { return true; } } |