Added support to the Marshmallow new permission model by saulmm · Pull Request #78 · android/testing-samples · GitHub
Skip to content

Added support to the Marshmallow new permission model #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoseAlcerreca merged 1 commit into from
Feb 4, 2016
Merged

Added support to the Marshmallow new permission model #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ui/espresso/IntentsBasicSample/app/build.gradle
View file
Open in desktop
12 changes: 11 additions & 1 deletion ...le/app/src/main/java/com/example/android/testing/espresso/BasicSample/DialerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@

package com.example.android.testing.espresso.BasicSample;

import android.Manifest;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.view.View;
import android.widget.EditText;
import android.widget.Toast;

/**
* Simple Dialer Activity which shows an {@link EditText} field to enter a phone number. Upon
Expand All @@ -46,7 +50,13 @@ protected void onCreate(Bundle savedInstanceState) {
}

public void onCall(View view) {
startActivity(createCallIntentFromNumber());
boolean hasCallPhonePermission = ContextCompat.checkSelfPermission(this,
Manifest.permission.CALL_PHONE) == PackageManager.PERMISSION_GRANTED;

if (hasCallPhonePermission)
startActivity(createCallIntentFromNumber());
else
Toast.makeText(this, R.string.warning_call_phone_permission, Toast.LENGTH_SHORT).show();
}

public void onPickContact(View view) {
Expand Down
1 change: 1 addition & 0 deletions ui/espresso/IntentsBasicSample/app/src/main/res/values/strings.xml
View file
Open in desktop