Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes use of permission string in WebRuntimeActivity"

Browse Source
This commit is contained in:
Steve Block
2010-06-24 06:16:15 -07:00
committed by Android (Google) Code Review
parent a18dbdf420 c9eecb274b
commit abe9e69c45
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webruntime/WebRuntimeActivity.java
View File

@@ -21,6 +21,7 @@ import android.content.Intent;
import android.content.ComponentName;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.Manifest;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
@@ -45,7 +46,6 @@ import java.net.URL;
public class WebRuntimeActivity extends Activity
{
private final static String LOGTAG = "WebRuntimeActivity";
private final static String locationPermission = "android.permission.ACCESS_FINE_LOCATION";
private WebView mWebView;
private URL mBaseUrl;
@@ -118,7 +118,8 @@ public class WebRuntimeActivity extends Activity
// Use a custom WebChromeClient with geolocation permissions handling to always
// allow or deny, based on the app's permissions.
String packageName = componentName.getPackageName();
final boolean allowed = packageManager.checkPermission(locationPermission, packageName)
final boolean allowed = packageManager.checkPermission(
Manifest.permission.ACCESS_FINE_LOCATION, packageName)
== PackageManager.PERMISSION_GRANTED;
mWebView.setWebChromeClient(new WebChromeClient() {
public void onGeolocationPermissionsShowPrompt(