diff options
author | Neil Fuller <nfuller@google.com> | 2017-09-27 09:30:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-27 09:30:28 +0000 |
commit | eedca60375703ae4a8868107ffaa634bd3b89d62 (patch) | |
tree | d3f3f1eda53c5f26457e4630bc6a5df4f67c3f39 | |
parent | 96b823aa484b590f2d17f415575d413d2acd5176 (diff) | |
parent | fd43ac2097fe9104acdeaea23dcd45acce69cbfc (diff) | |
download | TimeZoneUpdater-eedca60375703ae4a8868107ffaa634bd3b89d62.tar.gz |
Merge "Explicitly disallow multiple user execute"
-rw-r--r-- | src/main/com/android/timezone/updater/RulesCheckReceiver.java | 12 |
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); |