Merge "Settings: Phone force close when set viocemail in speed dial settings" am: 0b88c3870e am: 96b3833876
am: 30fcd2df3c
Change-Id: Ia2fc7511e56658a87bcf33d244068c2daa7dde60
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a49ceba..4b87c42 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -95,6 +95,8 @@
<string name="no_vm_number_msg">No voicemail number is stored on the SIM card.</string>
<!-- Button label on the "Missing voicemail number" dialog -->
<string name="add_vm_number_str">Add number</string>
+ <!--Toast in Call settings when asked to launch voicemail for a guest user -->
+ <string name="voice_number_setting_primary_user_only">Voice mail for Call settings can only be changed by the primary user.</string>
<!-- Status message displayed on SIM PIN unlock panel -->
<string name="puk_unlocked">Your SIM card has been unblocked. Your phone is unlocking\u2026</string>
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index d637a18..3c9a300 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -24,6 +24,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.os.UserManager;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
@@ -38,6 +39,8 @@
import android.util.Log;
import android.view.MenuItem;
import android.widget.ListAdapter;
+import android.widget.Toast;
+
import com.android.internal.telephony.CallForwardInfo;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
@@ -215,7 +218,14 @@
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
-
+ // Make sure we are running as the primary user only
+ UserManager userManager = getApplicationContext().getSystemService(UserManager.class);
+ if (!userManager.isPrimaryUser()) {
+ Toast.makeText(this, R.string.voice_number_setting_primary_user_only,
+ Toast.LENGTH_SHORT).show();
+ finish();
+ return;
+ }
// Show the voicemail preference in onResume if the calling intent specifies the
// ACTION_ADD_VOICEMAIL action.
mShowVoicemailPreference = (icicle == null) &&