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

Commit f8f747a2 authored by Justin Chung's avatar Justin Chung Committed by Android (Google) Code Review
Browse files

Merge "Do not generate WTF for the SearchManager query" into main

parents 8840cf4f 3748d0e3

core/java/android/app/SystemServiceRegistry.java

+6 −0
Original line number Diff line number Diff line
@@ -1647,6 +1647,12 @@ public final class SystemServiceRegistry { 
                case Context.VIRTUALIZATION_SERVICE:

                case Context.VIRTUAL_DEVICE_SERVICE:

                    return null;

                case Context.SEARCH_SERVICE:

                    // Wear device does not support SEARCH_SERVICE so we do not print WTF here

                    PackageManager manager = ctx.getPackageManager();

                    if (manager != null && manager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {

                        return null;

                    }

            }

            Slog.wtf(TAG, "Manager wrapper not available: " + name);

            return null;

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −4
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    boolean mPreloadedRecentApps;

    final Object mServiceAcquireLock = new Object();

    Vibrator mVibrator; // Vibrator for giving feedback of orientation changes

    SearchManager mSearchManager;

    AccessibilityManager mAccessibilityManager;

    AccessibilityManagerInternal mAccessibilityManagerInternal;

    BurnInProtectionHelper mBurnInProtectionHelper;
@@ -2217,7 +2216,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);

        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);

        mSensorPrivacyManager = mContext.getSystemService(SensorPrivacyManager.class);

        mSearchManager = mContext.getSystemService(SearchManager.class);

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);

        mUserManagerInternal = LocalServices.getService(UserManagerInternal.class);
@@ -4009,8 +4007,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        args.putLong(Intent.EXTRA_TIME, eventTime);

        args.putInt(AssistUtils.INVOCATION_TYPE_KEY, invocationType);



        if (mSearchManager != null) {

            mSearchManager.launchAssist(args);

        SearchManager searchManager = mContext.getSystemService(SearchManager.class);

        if (searchManager != null) {

            searchManager.launchAssist(args);

        } else {

            // Fallback to status bar if search manager doesn't exist (e.g. on wear).

            StatusBarManagerInternal statusBar = getStatusBarManagerInternal();

services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ class TestPhoneWindowManager { 
    }



    void overrideSearchManager(SearchManager searchManager) {

        mPhoneWindowManager.mSearchManager = searchManager;

        doReturn(searchManager).when(mContext).getSystemService(eq(SearchManager.class));

    }



    void assumeResolveActivityNotNull() {