release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367572 snap-temp-L13500000107248413

Change-Id: Ifbdc0890414c08df62bab42ef1d18e648f5058a3

1 files changed, 12 insertions, 0 deletions

diff --git a/src/main/com/android/timezone/updater/RulesCheckReceiver.java b/src/main/com/android/timezone/updater/RulesCheckReceiver.java
index 92a8bd5..003b2e4 100644
--- a/src/main/com/android/timezone/updater/RulesCheckReceiver.java
+++ b/src/main/com/android/timezone/updater/RulesCheckReceiver.java
@@ -30,6 +30,7 @@ import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import android.os.UserHandle;
 import android.provider.TimeZoneRulesDataContract;
 import android.util.Log;
 
@@ -85,6 +86,17 @@ public class RulesCheckReceiver extends BroadcastReceiver {
                     + ", action=" + intent.getAction());
             return;
         }
+
+        // The time zone update process should run as the system user exclusively as it's a
+        // system feature, not user dependent.
+        UserHandle currentUserHandle = android.os.Process.myUserHandle();
+        if (!currentUserHandle.isSystem()) {
+            // Just do nothing.
+            Log.w(TAG, "Supposed to be running as the system user,"
+                    + " instead running as user=" + currentUserHandle);
+            return;
+        }
+
         mRulesManager = (RulesManager) context.getSystemService("timezone");
 
         byte[] token = intent.getByteArrayExtra(RulesUpdaterContract.EXTRA_CHECK_TOKEN);