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

Commit 47e4941c authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.0' into a16

parents 35482296 85331b06

core/java/android/inputmethodservice/InputMethodService.java

+8 −6
Original line number Diff line number Diff line
@@ -918,8 +918,14 @@ public class InputMethodService extends AbstractInputMethodService { 
            // {@link #restartInput(InputConnection, EditorInfo)}.

            mImeDispatcher = params.imeDispatcher;

            if (mWindow != null) {

                mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(

                        params.imeDispatcher);

                mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(mImeDispatcher);

                if (mDecorViewVisible && mShowInputRequested) {

                    // Back callback is typically registered in {@link #showWindow()}, but it's

                    // possible for {@link #doStartInput()} to be called without

                    // {@link #showWindow()} so we also register here, after setting the new

                    // dispatcher.

                    registerDefaultOnBackInvokedCallback();

                }

            }

        }
@@ -3539,10 +3545,6 @@ public class InputMethodService extends AbstractInputMethodService { 
                mInlineSuggestionSessionController.notifyOnStartInputView();

                onStartInputView(mInputEditorInfo, restarting);

                startExtractingText(true);

                // Back callback is typically registered in {@link #showWindow()}, but it's possible

                // for {@link #doStartInput()} to be called without {@link #showWindow()} so we also

                // register here.

                registerDefaultOnBackInvokedCallback();

            } else if (mCandidatesVisibility == View.VISIBLE) {

                if (DEBUG) Log.v(TAG, "CALL: onStartCandidatesView");

                mCandidatesViewStarted = true;

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+0 −9
Original line number Diff line number Diff line
@@ -180,15 +180,6 @@ public final class MessageQueue { 
            if (processName.contains("test") || processName.contains("Test")) {

                sIsProcessAllowedToUseConcurrent = false;

            }

        } else {

            // Also explicitly allow SystemUI processes.

            // SystemUI doesn't run in a core UID, but we want to give it the performance boost,

            // and we know that it's safe to use the concurrent implementation in SystemUI.

            sIsProcessAllowedToUseConcurrent =

                    processName.equals("com.android.systemui")

                            || processName.startsWith("com.android.systemui:");

            // On Android distributions where SystemUI has a different process name,

            // the above condition may need to be adjusted accordingly.

        }



        // We can lift these restrictions in the future after we've made it possible for test

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -9657,6 +9657,10 @@ 
            android:name="com.android.server.patch.25239169"

            android:value="true" />



        <meta-data

            android:name="com.android.server.patch.34957421"

            android:value="true" />



    </application>



</manifest>

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java

+6 −1
Original line number Diff line number Diff line
@@ -277,7 +277,12 @@ public class CompanionDeviceDiscoveryService extends Service { 


        // Stop BLE scanning.

        if (mBleScanCallback != null) {

            try {

                mBleScanner.stopScan(mBleScanCallback);

            } catch (IllegalStateException e) {

                Slog.e(TAG, "Unable to stop BLE scanner. The scanner is already"

                        + " turned off or Bluetooth is disabled.");

            }

        }



        Handler.getMain().removeCallbacks(mSoftTimeoutRunnable);

packages/SettingsLib/res/values-af/cm_strings.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2016 The CyanogenMod Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="screen_zoom_summary_smaller">Kleiner</string>

    <string name="screen_zoom_summary_smallest">Kleinste</string>

</resources>