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

Commit ca3f142d 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

* commit '23c8292a':
  Grant NFC tag app default permissions.

Change-Id: Ifb45fe0367de5bd462640c95dbe97466afce96b6
parents 38fdef8d 23c8292a

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);

        }

        }

    }

    }