diff options
| -rw-r--r-- | docs/html/shareables/adl/2011Q3_Android_Market_for_Developers.pdf | bin | 0 -> 3175989 bytes | |||
| -rw-r--r-- | docs/html/shareables/adl/2011Q3_Designing_UIs_for_Phones_and_Tablets.pdf | bin | 0 -> 5417659 bytes | |||
| -rw-r--r-- | docs/html/shareables/adl/2011Q3_Introduction_to_Honeycomb_APIs.pdf | bin | 0 -> 11088986 bytes | |||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java | 9 | ||||
| -rwxr-xr-x | services/java/com/android/server/location/GpsLocationProvider.java | 9 |
5 files changed, 7 insertions, 11 deletions
diff --git a/docs/html/shareables/adl/2011Q3_Android_Market_for_Developers.pdf b/docs/html/shareables/adl/2011Q3_Android_Market_for_Developers.pdf Binary files differnew file mode 100644 index 000000000000..598a27e7c4e7 --- /dev/null +++ b/docs/html/shareables/adl/2011Q3_Android_Market_for_Developers.pdf diff --git a/docs/html/shareables/adl/2011Q3_Designing_UIs_for_Phones_and_Tablets.pdf b/docs/html/shareables/adl/2011Q3_Designing_UIs_for_Phones_and_Tablets.pdf Binary files differnew file mode 100644 index 000000000000..6ef41dd8271b --- /dev/null +++ b/docs/html/shareables/adl/2011Q3_Designing_UIs_for_Phones_and_Tablets.pdf diff --git a/docs/html/shareables/adl/2011Q3_Introduction_to_Honeycomb_APIs.pdf b/docs/html/shareables/adl/2011Q3_Introduction_to_Honeycomb_APIs.pdf Binary files differnew file mode 100644 index 000000000000..da954d80c53e --- /dev/null +++ b/docs/html/shareables/adl/2011Q3_Introduction_to_Honeycomb_APIs.pdf diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index f6ec4140bf43..81e1901f398a 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -358,15 +358,16 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler public void takeEmergencyCallAction() { mHasOverlay = true; - // FaceLock must be stopped if it is running when emergency call is pressed - stopAndUnbindFromFaceLock(); - // Continue showing FaceLock area until dialer comes up + // Continue showing FaceLock area until dialer comes up or call is resumed if (mLockPatternUtils.usingBiometricWeak() && - mLockPatternUtils.isBiometricWeakInstalled()) { + mLockPatternUtils.isBiometricWeakInstalled() && mFaceLockServiceRunning) { showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT); } + // FaceLock must be stopped if it is running + stopAndUnbindFromFaceLock(); + pokeWakelock(EMERGENCY_CALL_TIMEOUT); if (TelephonyManager.getDefault().getCallState() == TelephonyManager.CALL_STATE_OFFHOOK) { diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java index 0ce5499a1e0b..00788bad3d79 100755 --- a/services/java/com/android/server/location/GpsLocationProvider.java +++ b/services/java/com/android/server/location/GpsLocationProvider.java @@ -554,13 +554,8 @@ public class GpsLocationProvider implements LocationProviderInterface { long delay; - // force refresh NTP cache when outdated - if (mNtpTime.getCacheAge() >= NTP_INTERVAL) { - mNtpTime.forceRefresh(); - } - - // only update when NTP time is fresh - if (mNtpTime.getCacheAge() < NTP_INTERVAL) { + // GPS requires fresh NTP time + if (mNtpTime.forceRefresh()) { long time = mNtpTime.getCachedNtpTime(); long timeReference = mNtpTime.getCachedNtpTimeReference(); long certainty = mNtpTime.getCacheCertainty(); |