From e6f2ad9efe830f71be990feda9e0cfa559e6aff1 Mon Sep 17 00:00:00 2001
From: Nikolay Nizov <nizovn@gmail.com>
Date: Thu, 4 Aug 2016 13:17:01 +0300
Subject: [PATCH] meta-android: android-tools-conf: enable mtp

Signed-off-by: Nikolay Nizov <nizovn@gmail.com>
---
 .../android-tools-conf/android-gadget-setup      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/meta-android/recipes-android/android-tools/android-tools-conf/android-gadget-setup b/meta-android/recipes-android/android-tools/android-tools-conf/android-gadget-setup
index f7d997372..d1499b707 100644
--- a/meta-android/recipes-android/android-tools/android-tools-conf/android-gadget-setup
+++ b/meta-android/recipes-android/android-tools/android-tools-conf/android-gadget-setup
@@ -1,5 +1,17 @@
 #!/bin/sh
 
+if [ "$1" != "adb" ] && [ "$1" != "noadb" ]; then
+    exit 0
+fi
+
+functions="mtp"
+if [ "$1" = "adb" ]; then
+    functions="$functions,adb"
+fi
+
+old_functions=`cat /sys/class/android_usb/android0/functions`
+[ "$old_functions" != "$functions" ] || { exit 0; }
+
 # TODO enable the lines below once we have support for getprop
 # retrieve the product info from Android
 # manufacturer=$(getprop ro.product.manufacturer Android)
@@ -18,8 +30,8 @@ echo $model > /sys/class/android_usb/android0/iProduct
 
 echo "0" > /sys/class/android_usb/android0/enable
 echo "18d1" > /sys/class/android_usbid_usb/android0/idVendor
-echo "D002" > /sys/class/android_usb/android0/idProduct
-echo "adb" > /sys/class/android_usb/android0/functions
+echo "4EE2" > /sys/class/android_usb/android0/idProduct
+echo "$functions" > /sys/class/android_usb/android0/functions
 echo "1" >  /sys/class/android_usb/android0/enable
 
 sleep 4