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

Commit bf4d8d12 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent inclusion of null KeyphraseMetadata in info map."

parents 4373315a d7a7af55

core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java

+5 −3
Original line number Diff line number Diff line
@@ -130,9 +130,11 @@ public class KeyphraseEnrollmentInfo { 
                    continue;

                }



                mKeyphrasePackageMap.put(

                        getKeyphraseMetadataFromApplicationInfo(pm, ai, parseErrors),

                        ai.packageName);

                KeyphraseMetadata metadata =

                        getKeyphraseMetadataFromApplicationInfo(pm, ai, parseErrors);

                if (metadata != null) {

                    mKeyphrasePackageMap.put(metadata, ai.packageName);

                }

            } catch (PackageManager.NameNotFoundException e) {

                String error = "error parsing voice enrollment meta-data for "

                        + ri.activityInfo.packageName;