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

Commit 5c405e11 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Return null instead of throwing ServiceNotFoundException when... 

Merge "Return null instead of throwing ServiceNotFoundException when VPN_MANAGEMENT_SERVICE is not available." into main
parents db80d1c1 d3beed3b

core/java/android/app/SystemServiceRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ public final class SystemServiceRegistry { 
                if (service == null

                        && ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)

                        && android.server.Flags.allowRemovingVpnService()) {

                    throw new ServiceNotFoundException(Context.VPN_MANAGEMENT_SERVICE);

                    return null;

                }

                return new VpnManager(ctx, service);

            }});