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

Commit 3079afaa authored by Mike LeBeau's avatar Mike LeBeau Committed by Android Git Automerger
Browse files

am af8c900a: Merge "Use flattenToShortString instead of toShortString on... 

am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentNam

Merge commit 'af8c900a' into froyo-plus-aosp

* commit 'af8c900a':
  Use flattenToShortString instead of toShortString on ComponentNames to
parents 9ea4668c af8c900a

core/java/android/app/SearchDialog.java

+2 −2
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        Intent voiceIntent = new Intent(baseIntent);

        ComponentName searchActivity = searchable.getSearchActivity();

        voiceIntent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE,

                searchActivity == null ? null : searchActivity.toShortString());

                searchActivity == null ? null : searchActivity.flattenToShortString());

        return voiceIntent;

    }
@@ -878,7 +878,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        voiceIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, language);

        voiceIntent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, maxResults);

        voiceIntent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE,

                searchActivity == null ? null : searchActivity.toShortString());

                searchActivity == null ? null : searchActivity.flattenToShortString());

        

        // Add the values that configure forwarding the results

        voiceIntent.putExtra(RecognizerIntent.EXTRA_RESULTS_PENDINGINTENT, pending);