adbd falsely looks for /data/.adb_onlock to override the screen lock check

[Oliver Grawert]

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 the mountpoint is /data, in a running ubuntu system the mountpoint is named /userdata so adb needs to be fixed to check /userdata/.adb_onlock instead.

[Oliver Grawert (ogra)]

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 address hidden> 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"
 +

[Launchpad Janitor (janitor)]

This bug was fixed in the package android-tools - 4.2.2+git20130218-3ubuntu41

---------------
android-tools (4.2.2+git20130218-3ubuntu41) vivid; urgency=medium

  core/adbd/services.c:
  * disable all support for "adb root" (LP: #1367304)
  * check screen lock state before allowing adb push/pull (LP: #1423293)
  * move the screen lock check for adb shell to the arg processing code
  * fix description of android-tools-adbd (LP: #1264427)
  * use the right path for the lock check override file (LP: #1414288)
 -- Oliver Grawert <email address hidden> Mon, 02 Mar 2015 13:30:02 +0100