Remove temporarily pre-grant permission

Remove temporarily pre-grant permission with STOPSHIP during droidfood.

Bug: 128289173
Test: Manually
Merged-In: I236aaff3f742981b2212030bd9f8cede84bcf748
Change-Id: I236aaff3f742981b2212030bd9f8cede84bcf748

diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index 108eaf6..e025646 100644 (file)
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -744,12 +744,6 @@ public final class DefaultPermissionGrantPolicy {
                         TelephonyManager.ACTION_EMERGENCY_ASSISTANCE, userId),
                 userId, CONTACTS_PERMISSIONS, PHONE_PERMISSIONS);
 
-        // STOPSHIP(b/128289173): remove once EmergencyInfo app was replaced.
-        grantSystemFixedPermissionsToSystemPackage(
-                getDefaultSystemHandlerActivityPackage(
-                        "com.android.emergency.action.EMERGENCY_ASSISTANCE", userId),
-                userId, CONTACTS_PERMISSIONS, PHONE_PERMISSIONS);
-
         // NFC Tag viewer
         Intent nfcTagIntent = new Intent(Intent.ACTION_VIEW)
                 .setType("vnd.android.cursor.item/ndef_msg");