commit 97a6f96b45b88607aec94e0e88d1190e08739e9a
author Xin Li <delphij@google.com> Fri Jun 18 12:24:56 2021 -0700
committer Xin Li <delphij@google.com> Fri Jun 18 12:24:56 2021 -0700
tree d0206a9349419fa2403d8f63819909d2b8373519
parent 12f0501462c65826f6a1121ea34147cc81638282
parent 3757520e24d0b294f0698affa4a6fe9109e41ab6

DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: If20125b79df6624dbdbd39ef6f1661473fa03972
Change-Id: I7e8550ebfa2925cece5a9dfd18e0a0eba8eaaa05

src/com/android/mms/service/MmsService.java

diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index eb0fd88..40f13d9 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -47,6 +47,7 @@
 import android.telephony.TelephonyManager;
 import android.telephony.data.ApnSetting;
 import android.text.TextUtils;
+import android.util.EventLog;
 import android.util.SparseArray;
 
 import com.android.internal.telephony.IMms;
@@ -425,6 +426,10 @@
         public boolean archiveStoredConversation(String callingPkg, long conversationId,
                 boolean archived) throws RemoteException {
             LogUtil.d("archiveStoredConversation " + conversationId + " " + archived);
+            if (Binder.getCallingUid() != Process.SYSTEM_UID) {
+                EventLog.writeEvent(0x534e4554, "180419673", Binder.getCallingUid(), "");
+            }
+            enforceSystemUid();
             if (conversationId == -1) {
                 LogUtil.e("archiveStoredConversation: invalid thread id");
                 return false;