diff -Nru android-tools-4.2.2+git20130218/debian/changelog android-tools-4.2.2+git20130218/debian/changelog --- android-tools-4.2.2+git20130218/debian/changelog 2015-01-22 00:39:15.000000000 +0100 +++ android-tools-4.2.2+git20130218/debian/changelog 2015-01-24 13:02:07.000000000 +0100 @@ -1,3 +1,13 @@ +android-tools (4.2.2+git20130218-3ubuntu37rtm2) 14.09; urgency=medium + + * ubuntu-device-flash creates /data/.adb_onlock when flashing with + --developer-mode to override the new screen lock check in adbd. in a + booted ubuntu this file gets re-mapped to /userdata/.adb_onlock. fix the + checked path in teh adbd binary to look in the right place for this file. + (LP: #1414288) + + -- Oliver Grawert <[email protected]> Sat, 24 Jan 2015 12:59:36 +0100 + android-tools (4.2.2+git20130218-3ubuntu37rtm1) 14.09; urgency=medium * check screen lock state before allowing establishing a connection diff -Nru android-tools-4.2.2+git20130218/debian/patches/add_adbd.patch android-tools-4.2.2+git20130218/debian/patches/add_adbd.patch --- android-tools-4.2.2+git20130218/debian/patches/add_adbd.patch 2014-11-24 12:26:41.000000000 +0100 +++ android-tools-4.2.2+git20130218/debian/patches/add_adbd.patch 2015-01-24 12:59:33.000000000 +0100 @@ -10591,7 +10591,7 @@ +#define GREETER_INTERFACE "com.canonical.UnityGreeter" +#define PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties" +#define ACTIVE_PROPERTY "IsActive" -+#define UNLOCK_PATH "/data/.adb_onlock" ++#define UNLOCK_PATH "/userdata/.adb_onlock" + +#include "sysdeps.h" +
-- You received this bug notification because you are a member of Ubuntu Phonedations bugs, which is subscribed to android-tools in Ubuntu. https://bugs.launchpad.net/bugs/1414288 Title: adbd falsely looks for /data/.adb_onlock to override the screen lock check Status in android-tools package in Ubuntu: New Bug description: when flashing with ubuntu-device-flash having the --developer-mode option set, u-d-f puts a file called /data/.adb_onlock in place to allow overriding of the adbd screen state check during CI automation. while in recovery teh mountpoint is /data, in a running system the mountpoint in named /android/data so adb needs to be fixed to check /android/data/.adb_onlock instead. To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/android-tools/+bug/1414288/+subscriptions -- Mailing list: https://launchpad.net/~ubuntu-phonedations-bugs Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-phonedations-bugs More help : https://help.launchpad.net/ListHelp
