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

Commit 412c8b21 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Add lock and exception handling for startPointingUI 

There is a case that startPointingUI invoked from different threads in paraller, which causes phone process crash
Thus add exception handling
1. Add synchronize lock to prevent multiple threads can access startPointingUI at one time
2. Add exception handling for IllegalArgumentException which caused from 1

Bug: 396699411
Flag: EXEMPT bug fix
Test: regression test in live network
Change-Id: I3b58d4392bcab9bbd6272aa435db3bdf333322e1
parent e41480ed

src/java/com/android/internal/telephony/satellite/PointingAppController.java

+18 −9
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.telephony.satellite.SatelliteManager; 
import android.text.TextUtils;



import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.flags.FeatureFlags;
@@ -70,6 +71,9 @@ public class PointingAppController { 
    private boolean mLastNeedFullScreenPointingUI;

    private boolean mLastIsDemoMode;

    private boolean mLastIsEmergency;



    private final Object mListenerForPointingUIRegisteredLock = new Object();

    @GuardedBy("mListenerForPointingUIRegisteredLock")

    private boolean mListenerForPointingUIRegistered;

    @NonNull private String mPointingUiPackageName = "";

    @NonNull private String mPointingUiClassName = "";
@@ -419,17 +423,20 @@ public class PointingAppController { 
        launchIntent.putExtra("isEmergency", isEmergency);



        try {

            synchronized (mListenerForPointingUIRegisteredLock) {

                if (!mListenerForPointingUIRegistered) {

                    mActivityManager.addOnUidImportanceListener(mUidImportanceListener,

                            IMPORTANCE_GONE);

                    mListenerForPointingUIRegistered = true;

                }

            }

            mLastNeedFullScreenPointingUI = needFullScreenPointingUI;

            mLastIsDemoMode = isDemoMode;

            mLastIsEmergency = isEmergency;

            mContext.startActivityAsUser(launchIntent, UserHandle.CURRENT);

        } catch (ActivityNotFoundException ex) {

            ploge("startPointingUI: Pointing UI app activity is not found, ex=" + ex);

        } catch (ActivityNotFoundException | IllegalArgumentException ex) {

            ploge("startPointingUI: Unable to start Pointing UI activity due to an exception, ex="

                    + ex);

        }

    }
@@ -437,11 +444,13 @@ public class PointingAppController { 
     * Remove the Importance Listener For Pointing UI App once the satellite is disabled

     */

    public void removeListenerForPointingUI() {

        synchronized (mListenerForPointingUIRegisteredLock) {

            if (mListenerForPointingUIRegistered) {

                mActivityManager.removeOnUidImportanceListener(mUidImportanceListener);

                mListenerForPointingUIRegistered = false;

            }

        }

    }



    public void updateSendDatagramTransferState(int subId,

            @SatelliteManager.DatagramType int datagramType,