From 9971e3f4bad925e87fc7c4bd82a7e6b097ce3981 Mon Sep 17 00:00:00 2001 From: Tao Bai Date: Wed, 16 Jul 2014 14:10:22 -0700 Subject: Changes correspoding to Permission API change BUG: 15432556 Change-Id: I23fccf2e3e04b8f4ebab566a456c2373269257c2 --- src/com/android/browser/PermissionsPrompt.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/com/android/browser/PermissionsPrompt.java') diff --git a/src/com/android/browser/PermissionsPrompt.java b/src/com/android/browser/PermissionsPrompt.java index e84ab328b..29412d9b3 100644 --- a/src/com/android/browser/PermissionsPrompt.java +++ b/src/com/android/browser/PermissionsPrompt.java @@ -81,14 +81,16 @@ public class PermissionsPrompt extends RelativeLayout { } public void setMessage() { - long resources = mRequest.getResources(); + String[] resources = mRequest.getResources(); Vector strings = new Vector(); - if ((resources & PermissionRequest.RESOURCE_GEOLOCATION) != 0) - strings.add(getResources().getString(R.string.resource_geolocation)); - if ((resources & PermissionRequest.RESOURCE_VIDEO_CAPTURE) != 0) - strings.add(getResources().getString(R.string.resource_video_capture)); - if ((resources & PermissionRequest.RESOURCE_AUDIO_CAPTURE) != 0) - strings.add(getResources().getString(R.string.resource_audio_capture)); + for (String resource : resources) { + if (resource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) + strings.add(getResources().getString(R.string.resource_video_capture)); + else if (resource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) + strings.add(getResources().getString(R.string.resource_audio_capture)); + else if (resource.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) + strings.add(getResources().getString(R.string.resource_protected_media_id)); + } if (strings.isEmpty()) return; Enumeration e = strings.elements(); -- cgit v1.2.3