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

Commit 4174a508 authored by Arowa Suliman's avatar Arowa Suliman
Browse files

SystemServiceRegistry: Avoid WTF if WifiAware is unsupported 

On devices without FEATURE_WIFI_AWARE, requesting the WifiAwareManager
service triggers a "What a Terrible Failure" (WTF) log. This pollutes
the logs on platforms where the feature is intentionally absent.

Check for the feature before retrieving the service. If unsupported,
gracefully return null, preventing the WTF log entry.

Bug: 426627753
Test: Deploy to AL device and check the logs.
Flag: EXEMPT log only update
Change-Id: I0de61aacac7a0308d58f31d2d49b0712b9aaf0c6
parent 298837c0

core/java/android/app/SystemServiceRegistry.java

+5 −0
Original line number Diff line number Diff line
@@ -2049,6 +2049,11 @@ public final class SystemServiceRegistry { 
                        return null;

                    }

                    break;

                case Context.WIFI_AWARE_SERVICE:

                    if (!hasSystemFeatureOpportunistic(ctx, PackageManager.FEATURE_WIFI_AWARE)) {

                        return null;

                    }

                    break;

            }

            // TODO (b/404593897): make it a case of the switch statement above when the flag is

            //  removed.