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

Commit a9b990e3 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Android (Google) Code Review
Browse files

Merge "Remove temporarily pre-grant permission"

parents 65bcb4b0 37e8b7b5

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+0 −6
Original line number Diff line number Diff line
@@ -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");