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

Commit f00f6c21 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: ce1220b9 am: 713754a8 am: 98c076d1

Change-Id: I6d455307c27fa30090357d8d4fdb589ebfcfeaff
parents bfbd5c80 98c076d1

telephony/java/android/telephony/TelephonyManager.java

+3 −1
Original line number Diff line number Diff line
@@ -13209,7 +13209,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());

        }

    }