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

Commit 01217ebd authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev am:... 

Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev am: 3e79d2dc am: ab04c595

Change-Id: I2fd83e7bb2dd7eeb0e10cc85a5252ea0f7ab6dd3
parents 7cdab794 ab04c595

telephony/java/android/telephony/TelephonyManager.java

+3 −1
Original line number Diff line number Diff line
@@ -13098,7 +13098,9 @@ public class TelephonyManager { 
                service.userActivity();

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            // one-way notification, if telephony is not available, it is okay to not throw

            // exception here.

            Log.w(TAG, "notifyUserActivity exception: " + e.getMessage());

        }

    }