summaryrefslogtreecommitdiffstats
path: root/Android/03-Permissions/PermissionsLab
diff options
context:
space:
mode:
Diffstat (limited to 'Android/03-Permissions/PermissionsLab')
-rw-r--r--Android/03-Permissions/PermissionsLab/AndroidManifest.xml3
-rw-r--r--Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java3
-rw-r--r--Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java3
3 files changed, 6 insertions, 3 deletions
diff --git a/Android/03-Permissions/PermissionsLab/AndroidManifest.xml b/Android/03-Permissions/PermissionsLab/AndroidManifest.xml
index ce91e0a..b2b4f1d 100644
--- a/Android/03-Permissions/PermissionsLab/AndroidManifest.xml
+++ b/Android/03-Permissions/PermissionsLab/AndroidManifest.xml
@@ -3,7 +3,8 @@
package="course.labs.permissionslab"
android:versionCode="1"
android:versionName="1.0">
- <!-- TODO - add uses-permission elements -->
+ <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
+ <uses-permission android:name="course.labs.dangerousapp.DANGEROUS_ACTIVITY_PERM" />
<application
android:allowBackup="true"
diff --git a/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
index eca3506..8219b58 100644
--- a/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
+++ b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
@@ -28,6 +28,7 @@ public class ActivityLoaderActivity extends Activity {
private void startBookMarksActivity() {
Log.i(TAG, "Entered startBookMarksActivity()");
- // TODO - Start the BookmarksActivity
+ Intent intent = new Intent(ActivityLoaderActivity.this, BookmarksActivity.class);
+ startActivity(intent);
}
}
diff --git a/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
index 6f4ae7e..1b1c348 100644
--- a/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
+++ b/Android/03-Permissions/PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
@@ -68,6 +68,7 @@ public class BookmarksActivity extends Activity {
private void startGoToDangerousActivity() {
Log.i(TAG, "Entered startGoToDangerousActivity()");
- // TODO - Start the GoToDangerousActivity
+ Intent intent = new Intent(BookmarksActivity.this, GoToDangerousActivity.class);
+ startActivity(intent);
}
}