Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db4c3aff authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

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

am: 65ca16eb

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

Change-Id: Ifda48558713ea89d0d1b2de54b1abb738ca187e8
parents 81505b48 65ca16eb

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -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;










@@ -17252,7 +17253,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 {

























telephony/java/com/android/internal/telephony/TelephonyIntents.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -426,4 +426,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";















}