| commit | f8966a0a50aa794ada2a867d79629a38549dd3b2 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Mar 28 16:45:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 28 16:45:00 2017 +0000 |
| tree | bf9316ac0d23af55741a171308cd9adcdead47e6 | |
| parent | e8f5bbf82b51667b12785e161e33b227cf828e91 [diff] | |
| parent | 807275476853ae643c8001053973d80b85704d50 [diff] |
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" am: 07be9a0ef9 am: 79bde60db2 am: 8072754768 Change-Id: Iff682d4d9dc83544c0fce49c98d4c10563bf6317
diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index bcaac6e..73ee25a 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java
@@ -261,7 +261,7 @@ * by the system. */ public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS - = "android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"; + = "com.android.internal.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"; /** * <p>Broadcast Action: Indicates that the action is forbidden by network.