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

Commit e1d18c5e authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[bluetooth] remove ComponentInfoFlags annotation" am: f5028672 am: 5bed5556 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1900810

Change-Id: I3d050725ebdfe8831a537c2e1a248b293e7c47df
parents 0bfe44ee 5bed5556

android/app/src/com/android/bluetooth/hfp/HeadsetSystemInterface.java

+2 −2
Original line number Diff line number Diff line
@@ -83,12 +83,12 @@ public class HeadsetSystemInterface { 
     * there are no matches.

     */

    private @Nullable ComponentName resolveSystemService(@NonNull PackageManager pm,

            @PackageManager.ComponentInfoFlags int flags, Intent intent) {

            int componentInfoFlags, Intent intent) {

        if (intent.getComponent() != null) {

            return intent.getComponent();

        }



        List<ResolveInfo> results = pm.queryIntentServices(intent, flags);

        List<ResolveInfo> results = pm.queryIntentServices(intent, componentInfoFlags);

        if (results == null) {

            return null;

        }