From d375a04d2ec4edacb323ec86a2f310153fa4547c Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Fri, 13 May 2016 17:37:29 -0700 Subject: [PATCH] OMADM intent sent by both system and apps. Adding an exception for "com.android.omadm.service.CONFIGURATION_UPDATE" as it is sent by both system and OEM apps. Bug: 28757729 Change-Id: Ic89d38bbd78e436ca3c259f1aa61be450033a232 --- .../java/com/android/server/am/ActivityManagerService.java | 4 +++- .../com/android/internal/telephony/TelephonyIntents.java | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 313ca9a95415c..4b59a30b4b9e7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -16,6 +16,7 @@ package com.android.server.am; +import com.android.internal.telephony.TelephonyIntents; import com.google.android.collect.Lists; import com.google.android.collect.Maps; import com.android.internal.R; @@ -17246,7 +17247,8 @@ public final class ActivityManagerService extends ActivityManagerNative || Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS.equals(action) || AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action) || AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action) - || LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action)) { + || LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action) + || TelephonyIntents.ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE.equals(action)) { // Broadcast is either protected, or it's a public action that // we've relaxed, so it's fine for system internals to send. } else { diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index eafb3d40d17e2..2cb172250e18d 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -423,4 +423,10 @@ public class TelephonyIntents { */ public static final String ACTION_REQUEST_NETWORK_FAILED = "android.intent.action.REQUEST_NETWORK_FAILED"; + + /** + * Broadcast action to trigger CI OMA-DM Session. + */ + public static final String ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE = + "com.android.omadm.service.CONFIGURATION_UPDATE"; }