| 1 | From 3bc75e2ce9ef65b50d939b3d7d484dd03235b3a2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Nathan Chancellor <natechancellor@gmail.com> |
| 3 | Date: Sat, 4 Mar 2017 00:35:08 +0100 |
| 4 | Subject: [PATCH 43/52] Revert "Add a protected broadcast for Masquerade |
| 5 | events" |
| 6 | |
| 7 | Requires https://substratum.review/#/c/374 |
| 8 | |
| 9 | This reverts commit 4cd8990c89e79acb926f9c1ae1959661955dcbe2. |
| 10 | |
| 11 | Change-Id: Ida416c3949379a3d6a24a104667c74eef1f56630 |
| 12 | --- |
| 13 | core/res/AndroidManifest.xml | 2 -- |
| 14 | services/core/java/com/android/server/pm/PackageManagerService.java | 3 +-- |
| 15 | 2 files changed, 1 insertion(+), 4 deletions(-) |
| 16 | |
| 17 | diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml |
| 18 | index 9177507448f..ad2a4afcbef 100644 |
| 19 | --- a/core/res/AndroidManifest.xml |
| 20 | +++ b/core/res/AndroidManifest.xml |
| 21 | @@ -526,8 +526,6 @@ |
| 22 | <!-- ====================================================================== --> |
| 23 | <eat-comment /> |
| 24 | |
| 25 | - <protected-broadcast android:name="masquerade.substratum.STATUS_CHANGED" /> |
| 26 | - |
| 27 | <!-- ====================================================================== --> |
| 28 | <!-- Permissions for accessing user's contacts including personal profile --> |
| 29 | <!-- ====================================================================== --> |
| 30 | diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java |
| 31 | index 904bc5bd548..33bbf257f1c 100644 |
| 32 | --- a/services/core/java/com/android/server/pm/PackageManagerService.java |
| 33 | +++ b/services/core/java/com/android/server/pm/PackageManagerService.java |
| 34 | @@ -4550,8 +4550,7 @@ public class PackageManagerService extends IPackageManager.Stub { |
| 35 | if (actionName.startsWith("android.net.netmon.lingerExpired") |
| 36 | || actionName.startsWith("com.android.server.sip.SipWakeupTimer") |
| 37 | || actionName.startsWith("com.android.internal.telephony.data-reconnect") |
| 38 | - || actionName.startsWith("android.net.netmon.launchCaptivePortalApp") |
| 39 | - || actionName.startsWith("masquerade.substratum.STATUS_CHANGED")) { |
| 40 | + || actionName.startsWith("android.net.netmon.launchCaptivePortalApp")) { |
| 41 | return true; |
| 42 | } |
| 43 | } |
| 44 | -- |
| 45 | 2.11.1 |
| 46 | |