Update OMS patches

[GitHub/Stricted/android_vendor_extra.git] / patches / frameworks / base / 0043-Revert-Add-a-protected-broadcast-for-Masquerade-even.patch

From 3bc75e2ce9ef65b50d939b3d7d484dd03235b3a2 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Sat, 4 Mar 2017 00:35:08 +0100
Subject: [PATCH 43/52] Revert "Add a protected broadcast for Masquerade
 events"

Requires https://substratum.review/#/c/374

This reverts commit 4cd8990c89e79acb926f9c1ae1959661955dcbe2.

Change-Id: Ida416c3949379a3d6a24a104667c74eef1f56630
---
 core/res/AndroidManifest.xml                                        | 2 --
 services/core/java/com/android/server/pm/PackageManagerService.java | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9177507448f..ad2a4afcbef 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -526,8 +526,6 @@
     <!-- ====================================================================== -->
     <eat-comment />
 
-    <protected-broadcast android:name="masquerade.substratum.STATUS_CHANGED" />
-
     <!-- ====================================================================== -->
     <!-- Permissions for accessing user's contacts including personal profile   -->
     <!-- ====================================================================== -->
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 904bc5bd548..33bbf257f1c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4550,8 +4550,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                 if (actionName.startsWith("android.net.netmon.lingerExpired")
                         || actionName.startsWith("com.android.server.sip.SipWakeupTimer")
                         || actionName.startsWith("com.android.internal.telephony.data-reconnect")
-                        || actionName.startsWith("android.net.netmon.launchCaptivePortalApp")
-                        || actionName.startsWith("masquerade.substratum.STATUS_CHANGED")) {
+                        || actionName.startsWith("android.net.netmon.launchCaptivePortalApp")) {
                     return true;
                 }
             }
-- 
2.11.1