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

Commit ab0d39e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[telecom] remove PackageInfoFlags annotation" am: 725404c9 am:... 

Merge "[telecom] remove PackageInfoFlags annotation" am: 725404c9 am: fe948b3e am: 7abb9873 am: 8cb7fa48

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1899551

Change-Id: I5bed12c20f4ffcf8892b2f8446c7d52abcb2e641
parents a31fed07 8cb7fa48

src/com/android/server/telecom/CallDiagnosticServiceController.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class CallDiagnosticServiceController extends CallsManagerListenerBase { 
     */

    public interface ContextProxy {

        List<ResolveInfo> queryIntentServicesAsUser(@NonNull Intent intent,

                @PackageManager.ResolveInfoFlags int flags, @UserIdInt int userId);

                int resolveInfoFlags, @UserIdInt int userId);

        boolean bindServiceAsUser(@NonNull @RequiresPermission Intent service,

                @NonNull ServiceConnection conn, int flags, @NonNull UserHandle user);

        void unbindService(@NonNull ServiceConnection conn);