Android : 03-Permissions: add

43 files changed, 981 insertions, 0 deletions

diff --git a/Android/03-Permissions/DangerousApp/AndroidManifest.xml b/Android/03-Permissions/DangerousApp/AndroidManifest.xml
new file mode 100644
index 0000000..c9283a5
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="course.labs.dangerousapp"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="13"
+        android:targetSdkVersion="18" />
+
+    <!--
+          TODO - Using a permission element,
+          define a custom permission with name
+    		  "course.labs.permissions.DANGEROUS_ACTIVITY_PERM" 
+          and "dangerous" protection level.
+    -->
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <!-- TODO - enforce the custom permission on this Activity -->
+
+        <activity
+            android:name=".DangerousActivity"
+            android:label="@string/app_name" >
+
+            <!--
+                 TODO - add additional intent filter info so that this Activity
+                  will respond to an Implicit Intent with the action
+                  "course.labs.permissions.DANGEROUS_ACTIVITY"
+            -->
+
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/Android/03-Permissions/DangerousApp/ant.properties b/Android/03-Permissions/DangerousApp/ant.properties
new file mode 100644
index 0000000..b0971e8
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/ant.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
diff --git a/Android/03-Permissions/DangerousApp/build.xml b/Android/03-Permissions/DangerousApp/build.xml
new file mode 100644
index 0000000..3f6dd21
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DangerousApp" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Android/03-Permissions/DangerousApp/local.properties b/Android/03-Permissions/DangerousApp/local.properties
new file mode 100644
index 0000000..12a0114
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/opt/android-sdk
diff --git a/Android/03-Permissions/DangerousApp/proguard-project.txt b/Android/03-Permissions/DangerousApp/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/Android/03-Permissions/DangerousApp/project.properties b/Android/03-Permissions/DangerousApp/project.properties
new file mode 100644
index 0000000..ce39f2d
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-18
diff --git a/Android/03-Permissions/DangerousApp/res/drawable-hdpi/ic_launcher.png b/Android/03-Permissions/DangerousApp/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/drawable-hdpi/ic_launcher.png
diff --git a/Android/03-Permissions/DangerousApp/res/drawable-ldpi/ic_launcher.png b/Android/03-Permissions/DangerousApp/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..9923872
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/drawable-ldpi/ic_launcher.png
diff --git a/Android/03-Permissions/DangerousApp/res/drawable-mdpi/ic_launcher.png b/Android/03-Permissions/DangerousApp/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/drawable-mdpi/ic_launcher.png
diff --git a/Android/03-Permissions/DangerousApp/res/drawable-xhdpi/ic_launcher.png b/Android/03-Permissions/DangerousApp/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/drawable-xhdpi/ic_launcher.png
diff --git a/Android/03-Permissions/DangerousApp/res/layout/activity_main.xml b/Android/03-Permissions/DangerousApp/res/layout/activity_main.xml
new file mode 100644
index 0000000..efa0cef
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/layout/activity_main.xml
@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".DangerousActivity" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/hello_world" />
+
+</RelativeLayout>
diff --git a/Android/03-Permissions/DangerousApp/res/values/dimens.xml b/Android/03-Permissions/DangerousApp/res/values/dimens.xml
new file mode 100644
index 0000000..55c1e59
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/values/dimens.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/Android/03-Permissions/DangerousApp/res/values/strings.xml b/Android/03-Permissions/DangerousApp/res/values/strings.xml
new file mode 100644
index 0000000..c811fbb
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">DangerousApp</string>
+    <string name="hello_world">You have opened a dangerous activity</string>
+
+</resources>
diff --git a/Android/03-Permissions/DangerousApp/res/values/styles.xml b/Android/03-Permissions/DangerousApp/res/values/styles.xml
new file mode 100644
index 0000000..6ce89c7
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
diff --git a/Android/03-Permissions/DangerousApp/src/course/labs/dangerousapp/DangerousActivity.java b/Android/03-Permissions/DangerousApp/src/course/labs/dangerousapp/DangerousActivity.java
new file mode 100644
index 0000000..690e143
--- /dev/null
+++ b/Android/03-Permissions/DangerousApp/src/course/labs/dangerousapp/DangerousActivity.java
@@ -0,0 +1,13 @@
+package course.labs.dangerousapp;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class DangerousActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+    }
+}
diff --git a/Android/03-Permissions/Lab-Permissions.pdf b/Android/03-Permissions/Lab-Permissions.pdf
new file mode 100644
index 0000000..d67fff3
--- /dev/null
+++ b/Android/03-Permissions/Lab-Permissions.pdf
diff --git a/Android/03-Permissions/PermissionsLab/AndroidManifest.xml b/Android/03-Permissions/PermissionsLab/AndroidManifest.xml
new file mode 100644
index 0000000..ce91e0a
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="course.labs.permissionslab"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <!--  TODO - add uses-permission elements -->
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".ActivityLoaderActivity"
+            android:label="@string/title_main" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".BookmarksActivity"
+            android:label="@string/title_permissions" >
+        </activity>
+        <activity
+            android:name=".GoToDangerousActivity"
+            android:label="@string/title_activity_customization" >
+        </activity>
+    </application>
+</manifest>
diff --git a/Android/03-Permissions/PermissionsLab/ant.properties b/Android/03-Permissions/PermissionsLab/ant.properties
new file mode 100644
index 0000000..b0971e8
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/ant.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
diff --git a/Android/03-Permissions/PermissionsLab/build.xml b/Android/03-Permissions/PermissionsLab/build.xml
new file mode 100644
index 0000000..a883be7
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="PermissionsLab" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Android/03-Permissions/PermissionsLab/local.properties b/Android/03-Permissions/PermissionsLab/local.properties
new file mode 100644
index 0000000..12a0114
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/opt/android-sdk
diff --git a/Android/03-Permissions/PermissionsLab/proguard-project.txt b/Android/03-Permissions/PermissionsLab/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/Android/03-Permissions/PermissionsLab/project.properties b/Android/03-Permissions/PermissionsLab/project.properties
new file mode 100644
index 0000000..ce39f2d
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-18
diff --git a/Android/03-Permissions/PermissionsLab/res/drawable-hdpi/ic_launcher.png b/Android/03-Permissions/PermissionsLab/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/drawable-hdpi/ic_launcher.png
diff --git a/Android/03-Permissions/PermissionsLab/res/drawable-ldpi/ic_launcher.png b/Android/03-Permissions/PermissionsLab/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..9923872
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/drawable-ldpi/ic_launcher.png
diff --git a/Android/03-Permissions/PermissionsLab/res/drawable-mdpi/ic_launcher.png b/Android/03-Permissions/PermissionsLab/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/drawable-mdpi/ic_launcher.png
diff --git a/Android/03-Permissions/PermissionsLab/res/drawable-xhdpi/ic_launcher.png b/Android/03-Permissions/PermissionsLab/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/Android/03-Permissions/PermissionsLab/res/layout/activity_loader_activity.xml b/Android/03-Permissions/PermissionsLab/res/layout/activity_loader_activity.xml
new file mode 100644
index 0000000..bb4b36f
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/layout/activity_loader_activity.xml
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ActivityLoaderActivity" >
+    
+    <Button
+        android:id="@+id/start_bookmarks_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_button3" />
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/Android/03-Permissions/PermissionsLab/res/layout/bookmarks_activity.xml b/Android/03-Permissions/PermissionsLab/res/layout/bookmarks_activity.xml
new file mode 100644
index 0000000..d2b0a68
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/layout/bookmarks_activity.xml
@@ -0,0 +1,26 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:maxHeight="250dp"
+        android:text="@string/place_holder" />
+
+    <Button
+        android:id="@+id/get_bookmarks_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/perms_button1" />
+
+    <Button
+        android:id="@+id/go_to_dangerous_activity_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/perms_button2" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Android/03-Permissions/PermissionsLab/res/layout/go_to_dangerous_activity.xml b/Android/03-Permissions/PermissionsLab/res/layout/go_to_dangerous_activity.xml
new file mode 100644
index 0000000..a657661
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/layout/go_to_dangerous_activity.xml
@@ -0,0 +1,18 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cust_message" />
+
+    <Button
+        android:id="@+id/start_dangerous_activity_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cust_button1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Android/03-Permissions/PermissionsLab/res/values/strings.xml b/Android/03-Permissions/PermissionsLab/res/values/strings.xml
new file mode 100644
index 0000000..a9ee507
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/values/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">PermissionsLab</string>
+    <string name="title_main">PermissionsLab</string>
+    <string name="main_button3">Bookmarks Activity</string>
+    <string name="title_permissions">Permissions</string>
+    <string name="perms_button1">Get Bookmarks</string>
+    <string name="perms_button2">Go To DangerousActivity</string>
+    <string name="place_holder">Bookmarks Go Here</string>
+    <string name="title_activity_customization">Customization</string>
+    <string name="cust_button1">Start Dangerous Activity</string>
+    <string name="cust_message">This button will load a Dangerous Level activity</string>
+
+</resources>
\ No newline at end of file
diff --git a/Android/03-Permissions/PermissionsLab/res/values/styles.xml b/Android/03-Permissions/PermissionsLab/res/values/styles.xml
new file mode 100644
index 0000000..4a10ca4
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
new file mode 100644
index 0000000..eca3506
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
@@ -0,0 +1,33 @@
+package course.labs.permissionslab;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class ActivityLoaderActivity extends Activity {
+
+    private static final String TAG = "Lab-Permissions";
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_loader_activity);
+
+        Button startBookmarksButton = (Button) findViewById(R.id.start_bookmarks_button);
+        startBookmarksButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                startBookMarksActivity();
+            }
+        });
+    }
+
+    private void startBookMarksActivity() {
+        Log.i(TAG, "Entered startBookMarksActivity()");
+        // TODO - Start the BookmarksActivity
+    }
+}
diff --git a/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
new file mode 100644
index 0000000..6f4ae7e
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
@@ -0,0 +1,73 @@
+package course.labs.permissionslab;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.provider.Browser;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class BookmarksActivity extends Activity {
+
+    private static final String TAG = "Lab-Permissions";
+
+    static final String[] projection = {
+        Browser.BookmarkColumns.TITLE,
+        Browser.BookmarkColumns.URL
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.bookmarks_activity);
+
+        Button getBookmarksButton = (Button) findViewById(R.id.get_bookmarks_button);
+        getBookmarksButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                loadBookmarks();
+            }
+        });
+
+        Button goToDangerousActivityButton = (Button) findViewById(R.id.go_to_dangerous_activity_button);
+        goToDangerousActivityButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                startGoToDangerousActivity();
+            }
+        });
+    }
+
+    private void loadBookmarks() {
+
+        Log.i(TAG, "Entered loadBookmarks()");
+
+        String text = "";
+        Cursor query = getContentResolver().query(Browser.BOOKMARKS_URI, projection, null, null, null);
+
+        query.moveToFirst();
+        while (query.moveToNext()) {
+            text += query.getString(query
+                    .getColumnIndex(Browser.BookmarkColumns.TITLE));
+            text += "\n";
+            text += query.getString(query
+                    .getColumnIndex(Browser.BookmarkColumns.URL));
+            text += "\n\n";
+        }
+
+        TextView box = (TextView) findViewById(R.id.text);
+        box.setText(text);
+        Log.i(TAG, "Bookmarks loaded");
+    }
+
+    private void startGoToDangerousActivity() {
+        Log.i(TAG, "Entered startGoToDangerousActivity()");
+        // TODO - Start the GoToDangerousActivity
+    }
+}
diff --git a/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/GoToDangerousActivity.java b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/GoToDangerousActivity.java
new file mode 100644
index 0000000..171f469
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/GoToDangerousActivity.java
@@ -0,0 +1,36 @@
+package course.labs.permissionslab;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class GoToDangerousActivity extends Activity {
+
+    private static final String TAG = "Lab-Permissions";
+
+    private static final String DANGEROUS_ACTIVITY_ACTION = "course.labs.dangerousapp.DANGEROUS_ACTIVITY";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.go_to_dangerous_activity);
+
+        Button startDangerousActivityButton = (Button) findViewById(R.id.start_dangerous_activity_button);
+        startDangerousActivityButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                startDangerousActivity();
+            }
+        });
+    }
+
+    private void startDangerousActivity() {
+        Log.i(TAG, "Entered startDangerousActivity()");
+        startActivity(new Intent(DANGEROUS_ACTIVITY_ACTION));
+    }
+}
diff --git a/Android/03-Permissions/PermissionsLab/tests/AndroidManifest.xml b/Android/03-Permissions/PermissionsLab/tests/AndroidManifest.xml
new file mode 100644
index 0000000..ddd33d1
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="course.labs.permissionslab.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <!-- We add an application tag here just so that we can indicate that
+         this package needs to link against the android.test library,
+         which is needed when building test cases. -->
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+    <!--
+    This declares that this application uses the instrumentation test runner targeting
+    the package of course.labs.permissionslab.  To run the tests use the command:
+    "adb shell am instrument -w course.labs.permissionslab.tests/android.test.InstrumentationTestRunner"
+    -->
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+                     android:targetPackage="course.labs.permissionslab"
+                     android:label="Tests for course.labs.permissionslab"/>
+</manifest>
diff --git a/Android/03-Permissions/PermissionsLab/tests/ant.properties b/Android/03-Permissions/PermissionsLab/tests/ant.properties
new file mode 100644
index 0000000..1624402
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/ant.properties
@@ -0,0 +1,18 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+tested.project.dir=..
diff --git a/Android/03-Permissions/PermissionsLab/tests/build.xml b/Android/03-Permissions/PermissionsLab/tests/build.xml
new file mode 100644
index 0000000..4f27ee8
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="PermissionsLabTest" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Android/03-Permissions/PermissionsLab/tests/libs/robotium-solo-5.0.2-SNAPSHOT.jar b/Android/03-Permissions/PermissionsLab/tests/libs/robotium-solo-5.0.2-SNAPSHOT.jar
new file mode 100644
index 0000000..1df1903
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/libs/robotium-solo-5.0.2-SNAPSHOT.jar
diff --git a/Android/03-Permissions/PermissionsLab/tests/local.properties b/Android/03-Permissions/PermissionsLab/tests/local.properties
new file mode 100644
index 0000000..12a0114
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/opt/android-sdk
diff --git a/Android/03-Permissions/PermissionsLab/tests/proguard-project.txt b/Android/03-Permissions/PermissionsLab/tests/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/Android/03-Permissions/PermissionsLab/tests/project.properties b/Android/03-Permissions/PermissionsLab/tests/project.properties
new file mode 100644
index 0000000..ce39f2d
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-18
diff --git a/Android/03-Permissions/PermissionsLab/tests/src/course/labs/permissionslab/TestBookmarks.java b/Android/03-Permissions/PermissionsLab/tests/src/course/labs/permissionslab/TestBookmarks.java
new file mode 100644
index 0000000..b06d383
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/src/course/labs/permissionslab/TestBookmarks.java
@@ -0,0 +1,66 @@
+package course.labs.permissionslab.test;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+import com.robotium.solo.Solo;
+
+import course.labs.permissionslab.ActivityLoaderActivity;
+
+public class TestBookmarks extends
+ActivityInstrumentationTestCase2<ActivityLoaderActivity> {
+    private Solo solo;
+
+    public TestBookmarks() {
+        super(ActivityLoaderActivity.class);
+    }
+
+    public void setUp() throws Exception {
+        solo = new Solo(getInstrumentation());
+        getActivity();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        solo.finishOpenedActivities();
+    }
+
+    public void testRun() {
+
+        int timeout = 5;
+
+        // Wait for activity:
+        // 'course.labs.permissionslab.ActivityLoaderActivity'
+        assertTrue(
+                "course.labs.permissionslab.ActivityLoaderActivity is not found!",
+                solo.waitForActivity(course.labs.permissionslab.ActivityLoaderActivity.class));
+
+        // Click on Bookmarks Activity
+        solo.clickOnView(solo
+                .getView(course.labs.permissionslab.R.id.start_bookmarks_button));
+
+        // Wait for activity: 'course.labs.permissionslab.BookmarksActivity'
+        assertTrue(
+                "course.labs.permissionslab.BookmarksActivity is not found!",
+                solo.waitForActivity(course.labs.permissionslab.BookmarksActivity.class));
+
+        // Click on Get Bookmarks
+        solo.clickOnView(solo
+                .getView(course.labs.permissionslab.R.id.get_bookmarks_button));
+
+        // Check for at least one bookmark
+        assertTrue("'www.google.com' is not displayed!",
+                solo.waitForText("http"));
+
+        // Assert Log message created - 'Entered startBookMarksActivity()'
+        assertTrue("'Entered startBookMarksActivity()' Log message not found.",
+                solo.waitForLogMessage("Entered startBookMarksActivity()",timeout));
+
+        // Assert Log message created - 'Entered loadBookmarks()'
+        assertTrue("'Entered loadBookmarks()' Log message not found.",
+                solo.waitForLogMessage("Entered loadBookmarks()",timeout));
+
+        // Assert Log message created - 'Bookmarks loaded'
+        assertTrue("'Bookmarks loaded' Log message not found.",
+                solo.waitForLogMessage("Bookmarks loaded",timeout));
+    }
+}
diff --git a/Android/03-Permissions/PermissionsLab/tests/src/course/labs/permissionslab/TestDangerousApp.java b/Android/03-Permissions/PermissionsLab/tests/src/course/labs/permissionslab/TestDangerousApp.java
new file mode 100644
index 0000000..1379006
--- /dev/null
+++ b/Android/03-Permissions/PermissionsLab/tests/src/course/labs/permissionslab/TestDangerousApp.java
@@ -0,0 +1,63 @@
+package course.labs.permissionslab.test;
+
+import course.labs.permissionslab.ActivityLoaderActivity;
+import com.robotium.solo.*;
+import android.test.ActivityInstrumentationTestCase2;
+
+
+public class TestDangerousApp extends ActivityInstrumentationTestCase2<ActivityLoaderActivity> {
+    private Solo solo;
+
+    public TestDangerousApp() {
+        super(ActivityLoaderActivity.class);
+    }
+
+    public void setUp() throws Exception {
+        solo = new Solo(getInstrumentation());
+        getActivity();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        solo.finishOpenedActivities();
+    }
+
+    public void testRun() {
+
+        int timeout = 5;
+
+        // Wait for activity: 'course.labs.permissionslab.ActivityLoaderActivity'
+        assertTrue("course.labs.permissionslab.ActivityLoaderActivity is not found!", solo.waitForActivity(course.labs.permissionslab.ActivityLoaderActivity.class));
+
+        // Click on Bookmarks Activity
+        solo.clickOnView(solo.getView(course.labs.permissionslab.R.id.start_bookmarks_button));
+
+        // Wait for activity: 'course.labs.permissionslab.BookmarksActivity'
+        assertTrue("course.labs.permissionslab.BookmarksActivity is not found!", solo.waitForActivity(course.labs.permissionslab.BookmarksActivity.class));
+
+        // Click on Go To DangerousActivity
+        solo.clickOnView(solo.getView(course.labs.permissionslab.R.id.go_to_dangerous_activity_button));
+
+
+        // Wait for activity: 'course.labs.permissionslab.GoToDangerousActivity'
+        assertTrue("course.labs.permissionslab.GoToDangerousActivity is not found!", solo.waitForActivity(course.labs.permissionslab.GoToDangerousActivity.class));
+
+        // Assert that: 'This button will load a Dangerous Level activity' is shown
+        assertTrue("'This button will load a Dangerous Level activity' is not shown!", solo.waitForText(java.util.regex.Pattern.quote("This button will load a Dangerous Level activity")));
+
+        // Click on Start Dangerous Activity
+        solo.clickOnView(solo.getView(course.labs.permissionslab.R.id.start_dangerous_activity_button));
+
+        // Assert Log message created - 'Entered startBookMarksActivity()'
+        assertTrue("'Entered startBookMarksActivity()' Log message not found.",
+                solo.waitForLogMessage("Entered startBookMarksActivity()",timeout));
+
+        // Assert Log message created - 'Entered startGoToDangerousActivity()'
+        assertTrue("'Entered startGoToDangerousActivity()' Log message not found.",
+                solo.waitForLogMessage("Entered startGoToDangerousActivity()",timeout));
+
+        // Assert Log message created - 'Entered startDangerousActivity()'
+        assertTrue("'Entered startDangerousActivity()' Log message not found.",
+                solo.waitForLogMessage("Entered startDangerousActivity()",timeout));
+    }
+}