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

1 files changed, 3 insertions, 1 deletions

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 97a4f4e4f050..e85dfbefc752 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -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());
         }
     }