commit 6f4016524a51ed133b2e79f61e61a82b0f816dc7
author android-build-team Robot <android-build-team-robot@google.com> Tue May 04 17:53:20 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 04 17:53:20 2021 +0000
tree 6a5149c9145464e964b2979b708a3e160415bf06
parent 2c632d3e320d8c64ec5781baaa473353a3512fb9
parent bd82bac169174fe54cc2e177ec1acab4d9e5e026

Snap for 7316203 from bd82bac169174fe54cc2e177ec1acab4d9e5e026 to rvc-platform-release

Change-Id: I248d48bd13065dc85383922d238cfdf07960875d

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;