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

Commit d97422fc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32899522',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32899522', 'googleplex-android-review.googlesource.com/32921343'] into 25Q2-release.

Change-Id: I215ab0888dfd4b6a86e4001101f1d560df30d893
parents ea392682 6219daf7
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -1745,6 +1745,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH
     * BroadcastReceiver used to cancel the magnification shortcut when the screen turns off
     */
    private static class ScreenStateReceiver extends BroadcastReceiver {
        private static final String TAG = ScreenStateReceiver.class.getName();
        private final Context mContext;
        private final FullScreenMagnificationGestureHandler mGestureHandler;

@@ -1759,7 +1760,16 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH
        }

        public void unregister() {
            try {
                mContext.unregisterReceiver(this);
            } catch (IllegalArgumentException exception) {
                // b/399282180: the unregister happens when the handler is destroyed (cleanup). The
                // cleanup process should not cause the system crash, also the failure of unregister
                // will not affect the user experience since it's for the destroyed handler.
                // Therefore, we use try-catch here, to catch the exception to prevent crash, and
                // log the exception for future investigations.
                Slog.e(TAG, "Failed to unregister receiver: " + exception);
            }
        }

        @Override
+0 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Intent;
import android.content.pm.ServiceInfo;
import android.net.Uri;
import android.os.BadParcelableException;
@@ -1175,10 +1174,6 @@ public final class Call {
                int callerNumberVerificationStatus,
                Uri contactPhotoUri,
                UserHandle originatingUser) {
            if (extras == null) {
                extras = new Bundle();
            }
            extras.putParcelable(Intent.EXTRA_USER_HANDLE, originatingUser);
            mState = state;
            mTelecomCallId = telecomCallId;
            mHandle = handle;