commit b298aadb6ae87e1f08c67b01907ef6ae31d6343c
author Panos Thomas <panos@codeaurora.org> Wed Oct 22 12:24:21 2014 -0700
committer Panos Thomas <panos@codeaurora.org> Mon Jan 19 00:43:12 2015 -0800
tree 2b65957cdadd412f8722d65d6ac9973db8aa8b19
parent 7fe7f2943861afb6af3e4cfd312040c1a2f61341

Geolocation fixes

- Dismiss GeolocationPermissionsPrompt when user navigates
  away from the page or when the user responds to a prompt
  for the same origin on a different tab.
- Geolocation indicator missing in incognito tabs.

Change-Id: If73bc509a83ad543ed02f723c65dd1507f0d7ac1

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index b7be6a5..7560322 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -392,6 +392,12 @@
                 mTouchIconLoader = null;
             }
 
+            // Loading a new page voids any ongoing Geolocation permission
+            // requests.
+            if (mGeolocationPermissionsPrompt != null) {
+                mGeolocationPermissionsPrompt.dismiss();
+            }
+
             // finally update the UI in the activity if it is in the foreground
             mWebViewController.onPageStarted(Tab.this, view, favicon);
 
@@ -1731,6 +1737,7 @@
                     .findViewById(R.id.geolocation_permissions_prompt);
             mGeolocationPermissionsPrompt = (GeolocationPermissionsPrompt) stub
                     .inflate();
+            mGeolocationPermissionsPrompt.init(mCurrentState.mIncognito);
         }
         return mGeolocationPermissionsPrompt;
     }