Merge "CTS Verifier - Request runtime permissions" into mnc-dev
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index e2d67a1..c5469a7 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -44,6 +44,7 @@
<string name="test_results_cleared">Test results cleared.</string>
<string name="view">View</string>
<string name="test_results_error">Couldn\'t create test results report.</string>
+ <string name="runtime_permissions_error">Cannot continue. Please grant runtime permissions</string>
<string name="export">Export</string>
<string name="no_storage">Cannot save report to external storage, see log for details.</string>
<string name="report_saved">Report saved to: %s</string>
@@ -2029,7 +2030,7 @@
<!-- Audio Frequency Line Test -->
<string name="audio_frequency_line_test">Audio Frequency Line Test</string>
<string name="audio_frequency_line_info">
- The system will measure the frequency response of the left and right line outputs,
+ The system will measure the frequency response of the left and right line outputs,
by feeding them back thru the microphone conection with the loopback jack.
This test requires the Loopback Plug. Please connect a Loopback Plug on the headset
connector, and proceed with the instructions on the screen.
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
index 8cfc6df..976ff32 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
@@ -16,8 +16,10 @@
package com.android.cts.verifier;
+import android.Manifest;
import android.app.ListActivity;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
@@ -32,6 +34,20 @@
/** Top-level {@link ListActivity} for launching tests and managing results. */
public class TestListActivity extends AbstractTestListActivity implements View.OnClickListener {
+ private static final String [] RUNTIME_PERMISSIONS = {
+ Manifest.permission.ACCESS_FINE_LOCATION,
+ Manifest.permission.BODY_SENSORS,
+ Manifest.permission.READ_EXTERNAL_STORAGE,
+ Manifest.permission.READ_PHONE_STATE,
+ Manifest.permission.CALL_PHONE,
+ Manifest.permission.WRITE_CONTACTS,
+ Manifest.permission.CAMERA,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE,
+ Manifest.permission.RECORD_AUDIO,
+ Manifest.permission.READ_CONTACTS
+ };
+ private static final int CTS_VERIFIER_PERMISSION_REQUEST = 1;
+
private static final String TAG = TestListActivity.class.getSimpleName();
@Override
@@ -43,6 +59,18 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ for (String runtimePermission : RUNTIME_PERMISSIONS) {
+ Log.v(TAG, "Checking permissions for: " + runtimePermission);
+ if (checkSelfPermission(runtimePermission) != PackageManager.PERMISSION_GRANTED) {
+ requestPermissions(RUNTIME_PERMISSIONS, CTS_VERIFIER_PERMISSION_REQUEST);
+ return;
+ }
+
+ }
+ createContinue();
+ }
+
+ private void createContinue() {
if (!isTaskRoot()) {
finish();
}
@@ -63,6 +91,19 @@
}
@Override
+ public void onRequestPermissionsResult(
+ int requestCode, String permissions[], int[] grantResults) {
+ if (requestCode == CTS_VERIFIER_PERMISSION_REQUEST) {
+ if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+ createContinue();
+ return;
+ }
+ Log.v(TAG, "Permission not granted.");
+ Toast.makeText(this, R.string.runtime_permissions_error, Toast.LENGTH_SHORT).show();
+ }
+ }
+
+ @Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.test_list_menu, menu);
