am 0ba9fba5: am 0d0256f7: am fd1ad86d: am d03cd44c: am 5b769438: Merge "Added more logging to permissions tests" into mnc-dev
* commit '0ba9fba5980879c9da939052296abeea66d4f693':
Added more logging to permissions tests
diff --git a/hostsidetests/devicepolicy/app/PermissionApp/src/com/android/cts/permission/permissionapp/PermissionActivity.java b/hostsidetests/devicepolicy/app/PermissionApp/src/com/android/cts/permission/permissionapp/PermissionActivity.java
index 700aae1..fc45635 100644
--- a/hostsidetests/devicepolicy/app/PermissionApp/src/com/android/cts/permission/permissionapp/PermissionActivity.java
+++ b/hostsidetests/devicepolicy/app/PermissionApp/src/com/android/cts/permission/permissionapp/PermissionActivity.java
@@ -47,14 +47,18 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
final Intent received = getIntent();
+ Log.d(TAG, "Started with " + received);
+
final String action = received.getAction();
mPermission = received.getStringExtra(EXTRA_PERMISSION);
if (ACTION_REQUEST_PERMISSION.equals(action)) {
+ Log.d(TAG, "Requesting permission " + mPermission);
requestPermissions(new String[] {mPermission}, PERMISSIONS_REQUEST_CODE);
} else if (ACTION_CHECK_HAS_PERMISSION.equals(action)) {
+ Log.d(TAG, "Checking permission " + mPermission);
sendResultBroadcast(checkSelfPermission(mPermission));
- finish();
} else {
Log.w(TAG, "Unknown intent received: " + received);
finish();
@@ -73,7 +77,6 @@
Log.d(TAG, "Received valid permission result: " + grantResults[0]);
sendResultBroadcast(grantResults[0]);
}
- finish();
}
private void sendResultBroadcast(int result) {
@@ -81,5 +84,6 @@
Intent broadcast = new Intent(ACTION_PERMISSION_RESULT);
broadcast.putExtra(EXTRA_GRANT_STATE, result);
sendBroadcast(broadcast);
+ finish();
}
}