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

Commit b0bf6ee5 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Grant NFC tag app default permissions." into nyc-dev am: 23c8292a 

am: ca3f142d

* commit 'ca3f142d':
  Grant NFC tag app default permissions.

Change-Id: Ib9727328dbb9545e7e5beef89707ef6a214fd6d4
parents b646eab3 ca3f142d

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -595,6 +595,16 @@ final class DefaultPermissionGrantPolicy { 
                grantRuntimePermissionsLPw(emergencyInfoPckg, PHONE_PERMISSIONS, true, userId);

                grantRuntimePermissionsLPw(emergencyInfoPckg, PHONE_PERMISSIONS, true, userId);

            }

            }





            // NFC Tag viewer

            Intent nfcTagIntent = new Intent(Intent.ACTION_VIEW);

            nfcTagIntent.setType("vnd.android.cursor.item/ndef_msg");

            PackageParser.Package nfcTagPkg = getDefaultSystemHandlerActivityPackageLPr(

                    nfcTagIntent, userId);

            if (nfcTagPkg != null

                    && doesPackageSupportRuntimePermissions(nfcTagPkg)) {

                grantRuntimePermissionsLPw(nfcTagPkg, CONTACTS_PERMISSIONS, false, userId);

                grantRuntimePermissionsLPw(nfcTagPkg, PHONE_PERMISSIONS, false, userId);

            }

            mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);

            mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);

        }

        }

    }

    }