3g stopped working on giffgaff (o2) on mako

I have two mako devices, one running devel, one running devel-proposed. Normally my devel phone is my main one and is mostly used on wifi. I took my devel-proposed phone out on saturday and it was unable to connect to 3g at all.

Note: I had swapped SIM cards (both same network) between the two devices, so my proposed phone had my main phone number on it.

When I got home I've done some looking and found some debug info in bug 1335165.

I saw this in the syslog.

Aug 4 09:41:36 ubuntu-phablet NetworkManager[1465]: <info> Auto-activating connection '/234100516435967/context1'.
Aug 4 09:41:36 ubuntu-phablet NetworkManager[1465]: <info> Activation (/ril_0) starting connection '/234100516435967/context1'
Aug 4 09:41:36 ubuntu-phablet NetworkManager[1465]: <info> (/ril_0): device state change: disconnected -> prepare (reason 'none') [30 40 0]
Aug 4 09:41:36 ubuntu-phablet NetworkManager[1465]: <info> NetworkManager state is now CONNECTING
Aug 4 09:41:36 ubuntu-phablet NetworkManager[1465]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) scheduled...
Aug 4 09:41:36 ubuntu-phablet NetworkManager[1465]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) started...
Aug 4 09:41:36 ubuntu-phablet NetworkManager[1465]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) complete.
Aug 4 09:37:46 ubuntu-phablet ofonod[1279]: message repeated 3 times: [ ril_setup_data_call_cb: reply->status for apn: payandgo.o2.co.uk, is non-zero: SERVICE_OPTION_NOT_SUBSCRIBED]
Aug 4 09:41:38 ubuntu-phablet ofonod[1279]: ril_setup_data_call_cb: reply->status for apn: mobile.o2.co.uk, is non-zero: SERVICE_OPTION_NOT_SUBSCRIBED
Aug 4 09:41:38 ubuntu-phablet NetworkManager[1465]: <warn> OFONO connection failed: (32) Operation failed
Aug 4 09:41:38 ubuntu-phablet NetworkManager[1465]: <info> (/ril_0): device state change: prepare -> failed (reason 'unknown') [40 120 1]
Aug 4 09:41:38 ubuntu-phablet NetworkManager[1465]: <info> NetworkManager state is now DISCONNECTED
Aug 4 09:41:38 ubuntu-phablet NetworkManager[1465]: <warn> Activation (/ril_0) failed for connection '/234100516435967/context1'
Aug 4 09:41:38 ubuntu-phablet NetworkManager[1465]: <info> (/ril_0): device state change: failed -> disconnected (reason 'none') [120 30 0]
Aug 4 09:41:38 ubuntu-phablet NetworkManager[1465]: <info> (/ril_0): deactivating device (reason 'none') [0]
Aug 4 09:41:41 ubuntu-phablet NetworkManager[1465]: <info> Auto-activating connection '/234100516435967/context1'.
Aug 4 09:41:41 ubuntu-phablet NetworkManager[1465]: <info> Activation (/ril_0) starting connection '/234100516435967/context1'

My APN was set to mobile.o2.co.uk (which must have previously worked) but now no longer does? Or perhaps switching SIMs around reset the APN?

So to fix it I found the giffgaff settings at http://community.giffgaff.com/t5/Settings-for-your-device/Internet-and-MMS-settings-APN-guide/ta-p/3489121#faq_no_6

And issued the following:-

/usr/share/ofono/scripts/remove-contexts ; /usr/share/ofono/scripts/create-internet-context "giffgaff.com"

I rebooted the phone and now it works.