Merge lp:~ken-vandine/ubuntu-system-settings/rtm-add-sim-unlock-1378883 into lp:ubuntu-system-settings/rtm-14.09
Proposed by
Ken VanDine
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ken VanDine | ||||
Approved revision: | 975 | ||||
Merged at revision: | 982 | ||||
Proposed branch: | lp:~ken-vandine/ubuntu-system-settings/rtm-add-sim-unlock-1378883 | ||||
Merge into: | lp:ubuntu-system-settings/rtm-14.09 | ||||
Diff against target: |
326 lines (+187/-10) 7 files modified
plugins/security-privacy/CMakeLists.txt (+2/-0) plugins/security-privacy/SimPin.qml (+31/-6) plugins/security-privacy/connectivity.cpp (+49/-0) plugins/security-privacy/connectivity.h (+35/-0) plugins/security-privacy/plugin.cpp (+11/-0) tests/autopilot/ubuntu_system_settings/tests/__init__.py (+38/-3) tests/autopilot/ubuntu_system_settings/tests/test_security.py (+21/-1) |
||||
To merge this branch: | bzr merge lp:~ken-vandine/ubuntu-system-settings/rtm-add-sim-unlock-1378883 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Jonas G. Drange (community) | Approve | ||
Review via email: mp+248044@code.launchpad.net |
Commit message
[security/privacy] add connectivity binding and let user unlock a given SIM
Description of the change
[security/privacy] add connectivity binding and let user unlock a given SIM
To post a comment you must log in.
FAILED: Continuous integration, rev:975 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- rtm-14. 09-ci/50/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- 14.09-touch/ 29 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- rtm-14. 09-14.09- armhf-ci/ 51 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- rtm-14. 09-14.09- armhf-ci/ 51/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- 14.09-mako/ 30 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- 14.09-armhf/ 29 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- 14.09-armhf/ 29/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 17622
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- rtm-14. 09-ci/50/ rebuild
http://