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

Merge change 7137 into donut

Browse Source 
* changes:
  Remove the Google domains from the Gears permission table when the global location setting is set to false
This commit is contained in:
Android (Google) Code Review
2009-07-14 17:23:35 -07:00
parent 5628711a6f 190adf7fb2
commit 4c3a589e8e
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/webkit/GearsPermissionsManager.java
View File

@@ -55,6 +55,8 @@ class GearsPermissionsManager {
// The Gears permissions db schema version table. // The Gears permissions db schema version table.
private final static String GEARS_SCHEMA_VERSION_TABLE_NAME = private final static String GEARS_SCHEMA_VERSION_TABLE_NAME =
"VersionInfo"; "VersionInfo";
// The Gears permission value that denotes "allow access to location".
private static final int GEARS_ALLOW_LOCATION_ACCESS = 1;
// The shared pref name. // The shared pref name.
private static final String LAST_KNOWN_LOCATION_SETTING = private static final String LAST_KNOWN_LOCATION_SETTING =
"lastKnownLocationSystemSetting"; "lastKnownLocationSystemSetting";
@@ -119,8 +121,14 @@ class GearsPermissionsManager {
} }
private void setGearsPermissionForGoogleDomains(int systemPermission) { private void setGearsPermissionForGoogleDomains(int systemPermission) {
// Transform the system permission into a Gears permission // Transform the system permission into a boolean flag. When this
int gearsPermission = (systemPermission == 1 ? 1 : 2); // flag is true, it means the origins in gGearsWhiteList are added
// to the Gears location permission table with permission 1 (allowed).
// When the flag is false, the origins in gGearsWhiteList are removed
// from the Gears location permission table. Next time the user
// navigates to one of these origins, she will see the normal Gears
// permission prompt.
boolean addToGearsLocationTable = (systemPermission == 1 ? true : false);
// Build the path to the Gears library. // Build the path to the Gears library.
File file = new File(mGearsPath).getParentFile(); File file = new File(mGearsPath).getParentFile();
@@ -132,6 +140,13 @@ class GearsPermissionsManager {
+ GEARS_DATABASE_DIR + File.separator + GEARS_DATABASE_FILE); + GEARS_DATABASE_DIR + File.separator + GEARS_DATABASE_FILE);
// Remember whether or not we need to create the LocationAccess table. // Remember whether or not we need to create the LocationAccess table.
boolean needToCreateTables = !file.exists(); boolean needToCreateTables = !file.exists();
// If the database file does not yet exist and the system location
// setting says that the Gears origins need to be removed from the
// location permission table, it means that we don't actually need
// to do anything at all.
if (needToCreateTables && !addToGearsLocationTable) {
return;
}
// Try opening the Gears database. // Try opening the Gears database.
SQLiteDatabase permissions; SQLiteDatabase permissions;
try { try {
@@ -177,14 +192,21 @@ class GearsPermissionsManager {
schema); schema);
} }
ContentValues permissionValues = new ContentValues(); if (addToGearsLocationTable) {
ContentValues permissionValues = new ContentValues();
for (String url : sGearsWhiteList) { for (String url : sGearsWhiteList) {
permissionValues.put("Name", url); permissionValues.put("Name", url);
permissionValues.put("Value", gearsPermission); permissionValues.put("Value", GEARS_ALLOW_LOCATION_ACCESS);
permissions.replace(GEARS_LOCATION_ACCESS_TABLE_NAME, null, permissions.replace(GEARS_LOCATION_ACCESS_TABLE_NAME, null,
permissionValues); permissionValues);
permissionValues.clear(); permissionValues.clear();
}
} else {
for (String url : sGearsWhiteList) {
permissions.delete(GEARS_LOCATION_ACCESS_TABLE_NAME, "Name=?",
new String[] { url });
}
} }
// Commit the transaction. // Commit the transaction.
permissions.setTransactionSuccessful(); permissions.setTransactionSuccessful();