Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "OMADM intent sent by both system and apps." into nyc-dev

Browse Source 
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
  OMADM intent sent by both system and apps.

Change-Id: Icd3a9e9b35a2f4c44269fef2bbbe8d6835d93990
This commit is contained in:
Amit Mahajan
2016-05-17 17:49:56 +00:00
committed by android-build-merger
parent 4b19273c81 65ca16ebab
commit 4e36794b49
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -16,6 +16,7 @@
package com.android.server.am; package com.android.server.am;
import com.android.internal.telephony.TelephonyIntents;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import com.google.android.collect.Maps; import com.google.android.collect.Maps;
import com.android.internal.R; import com.android.internal.R;
@@ -17252,7 +17253,8 @@ public final class ActivityManagerService extends ActivityManagerNative
|| Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS.equals(action) || Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS.equals(action)
|| AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action) || AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action)
|| AppWidgetManager.ACTION_APPWIDGET_UPDATE.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 // Broadcast is either protected, or it's a public action that
// we've relaxed, so it's fine for system internals to send. // we've relaxed, so it's fine for system internals to send.
} else { } else {

6
telephony/java/com/android/internal/telephony/TelephonyIntents.java
View File

@@ -426,4 +426,10 @@ public class TelephonyIntents {
*/ */
public static final String ACTION_REQUEST_NETWORK_FAILED = public static final String ACTION_REQUEST_NETWORK_FAILED =
"android.intent.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";
} }