drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,519 Commits 1 Branch 0 Tags
Commit Graph

43519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
0e99d3bfab am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into honeycomb 
* commit 'df33b8c51d431a7c0f7a89ead8dfacdd3660ff48':
  Check for NTP time as soon as WIFI is connected.
 2011-03-01 15:50:41 -08:00
Amith Yamasani
df33b8c51d Merge "Check for NTP time as soon as WIFI is connected." into honeycomb 2011-03-01 15:47:57 -08:00
Eric Fischer
f6d1d87df5 am 86b7a597: Import revised translations. DO NOT MERGE 
* commit '86b7a59726010e0952b0ede4fd40d933aeb83384':
  Import revised translations.  DO NOT MERGE
 2011-03-01 14:41:39 -08:00
Eric Fischer
86b7a59726 Import revised translations. DO NOT MERGE 
Change-Id: I6f5f40b8dbbe271ccbb5493b3a6d7d1f08d1bdb3
 2011-03-01 14:17:03 -08:00
Costin Manolache
c039bb5d1e am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 
* commit '66d46ac61478c967ed45bd1c27b0436654d54299':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
 2011-03-01 13:28:03 -08:00
Amith Yamasani
8d394fa899 Check for NTP time as soon as WIFI is connected. 
Listen for connectivity changes. If WIFI is connected, check if
we have recently checked for NTP time. If we haven't yet checked the
time or it has been long enough (a day), then connect to the NTP server
and get the latest time. Update the time if it is significantly out of sync.

This doesn't poll the NTP server every time there is connectivity, only
if it hasn't been checked since boot or has been a day.

This fixes the problem that during SetupWizard, we try to contact the NTP
server before there is connectivity and fail. Now, as soon as the user
chooses a WiFi network to connect to, it will update the time before
getting to the Date/Time step. Then as soon as the user corrects the TZ,
the date/time should be correct.

Bug: 3491920
Change-Id: I62664156616510b67ecd6a1c24dd838b98d5204f
 2011-03-01 12:41:04 -08:00
Costin Manolache
66d46ac614 am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
 2011-03-01 12:29:40 -08:00
Costin Manolache
db52ab69f2 Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 2011-03-01 12:25:21 -08:00
Costin Manolache
ef419b2e14 DO NOT MERGE 
Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.

This is backward compatible - both new and old authenticators will work with old and new framework,
but the functionality will only be present if both sides support it.

Change-Id: Ib2838cc2159f45264b38c844cd4c1d6f315d8064
 2011-03-01 11:20:06 -08:00
Dianne Hackborn
4b8c9b7405 am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated." 
* commit '7fff2d19a24f9f9b669676864dc5652ab179d2fc':
  Fix leak when keylock is recreated.
 2011-03-01 11:13:14 -08:00
Jaikumar Ganesh
998a5617d5 am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '516393faba128ce43bee98b6319e060744fe7be6':
  Phone crash when old callback func is woken up when enabling BT.
 2011-03-01 11:12:56 -08:00
Mike Corrigan
49853dc19c am bd15112a: Fix the display priority of the airplane mode icon. 
* commit 'bd15112a29eefb93e62235574b694746044c9261':
  Fix the display priority of the airplane mode icon.
 2011-03-01 11:08:45 -08:00
Mike Corrigan
bd15112a29 Fix the display priority of the airplane mode icon. 
The airplane icon is used as a fallback when no
other radios are available *and* the AIRPLANE_MODE_ON system
setting is set to 1. (NetworkController now tracks changes to
the setting via ACTION_AIRPLANE_MODE_CHANGED broadcasts.)

This fixes wifi-only devices, for which the previous logic
did not correctly and consistently detect airplane mode.

Bug: 3489820
Change-Id: I226bb0e977f6a5fd3f2d829ba51ca54c5c910ef3
 2011-03-01 13:20:07 -05:00
Mike Lockwood
5d019f0e6d am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 
* commit 'c01e201f12149ca96593af4e18133d3b2fce5546':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
 2011-03-01 09:12:49 -08:00
Mike Lockwood
3fa12d459d am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
  DO NOT MERGE: Clean up USB notifications:
 2011-03-01 09:12:45 -08:00
Mike Lockwood
91dceb8143 am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '54e96c69d068593f1d5893be6067509b07abdadc':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-03-01 09:12:31 -08:00
Mike Lockwood
8697f397e2 am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit 'f41768c5837a078239e92d8fa1d2155394e4b6ac':
  Give system server permission to access USB. DO NOT MERGE
 2011-03-01 09:12:27 -08:00
Xavier Ducrohet
2d5ed07940 am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 
* commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b':
  Merge 1911a6f7 into gingerbread. do not merge.
 2011-03-01 09:12:15 -08:00
Dianne Hackborn
7fff2d19a2 am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated." 
* commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864':
  Fix leak when keylock is recreated.
 2011-02-28 18:06:46 -08:00
Dianne Hackborn
1de4a2ca58 am 62619392: Merge "Fix leak when keylock is recreated." 
* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
  Fix leak when keylock is recreated.
 2011-02-28 18:03:12 -08:00
Dianne Hackborn
626193926d Merge "Fix leak when keylock is recreated." 2011-02-28 17:54:54 -08:00
Jaikumar Ganesh
516393faba am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e':
  Phone crash when old callback func is woken up when enabling BT.
 2011-02-28 16:27:16 -08:00
Wink Saville
23fe005900 am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb 
* commit '0eb6af892948ba23bf9de5c5a6172c6ec50f8f71':
  Fixing the write of BackgroundData setting, DO NOT MERGE.
 2011-02-28 16:00:22 -08:00
Jaikumar Ganesh
9711b9b7aa am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
  Phone crash when old callback func is woken up when enabling BT.
 2011-02-28 16:00:01 -08:00
Wink Saville
0eb6af8929 Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb 2011-02-28 15:54:02 -08:00
Jaikumar Ganesh
1eefb529c7 Merge "Phone crash when old callback func is woken up when enabling BT." 2011-02-28 15:33:34 -08:00
Wink Saville
d2ab6a19e0 Fixing the write of BackgroundData setting, DO NOT MERGE. 
I outsmarted myself trying to minimize writes and caused no writes to occur.

bug:3485934
Change-Id: I43b6ebbed3f13277edfb2e28f09cf7b98ea66776
 2011-02-28 15:32:41 -08:00
Eric Fischer
ae7fb48873 am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '04a536af3c91fc78d07a7d5b242a40b2731ec0ff':
  Import revised translations.  DO NOT MERGE
 2011-02-28 14:08:39 -08:00
Eric Fischer
04a536af3c Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-28 14:05:59 -08:00
Irfan Sheriff
5af7cf7c55 am f9e2a491: Fix issue to clear scan alarms 
* commit 'f9e2a491176b086cd3c238b209e025cd68d76001':
  Fix issue to clear scan alarms
 2011-02-28 14:05:06 -08:00
Eric Fischer
877acf5dda Import revised translations. DO NOT MERGE 
Change-Id: I4e3908e02fbb60782dbf760dd5ff28e1ff2d75c7
 2011-02-28 13:58:10 -08:00
Mike Lockwood
c01e201f12 am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 
* commit '61c1bb4fef439650a3b88131c6e1360ffc03a7ed':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
 2011-02-28 13:18:06 -08:00
Mike Lockwood
fc88f94fc3 am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit '6da062a96c6f8126aad450a937144fab4333488f':
  DO NOT MERGE: Clean up USB notifications:
 2011-02-28 13:18:02 -08:00
Mike Lockwood
54e96c69d0 am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-02-28 13:17:58 -08:00
Mike Lockwood
f41768c583 am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit 'f7b99b32ad7a4872376355acabb5984142ba5e75':
  Give system server permission to access USB. DO NOT MERGE
 2011-02-28 13:17:54 -08:00
Mike Lockwood
61c1bb4fef Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 2011-02-28 13:12:11 -08:00
Mike Lockwood
6da062a96c Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 2011-02-28 13:12:03 -08:00
Mike Lockwood
3333f8afb2 Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 2011-02-28 13:11:55 -08:00
Mike Lockwood
f7b99b32ad Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 2011-02-28 13:11:37 -08:00
Irfan Sheriff
f9e2a49117 Fix issue to clear scan alarms 
If PNO is set after the device is disconnected, the scan
alarm should be cleared to prevent both PNO and alarm
being active at the same time

Bug: 3495698
Change-Id: Id48c87fef68a34a05799e6b82de4088e0573009f
 2011-02-28 12:29:33 -08:00
Xavier Ducrohet
7b9727558b am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 
* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
  Merge 1911a6f7 into gingerbread. do not merge.
 2011-02-28 12:29:08 -08:00
Xavier Ducrohet
edbd6139b9 Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 2011-02-28 12:24:01 -08:00
Daniel Sandler
cfeaa492a2 am 5404812d: Merge "When out of range, show device-appropriate no-signal bars." into honeycomb 
* commit '5404812dee9dccbbd43df81752f3061742235982':
  When out of range, show device-appropriate no-signal bars.
 2011-02-28 11:26:53 -08:00
Daniel Sandler
5404812dee Merge "When out of range, show device-appropriate no-signal bars." into honeycomb 2011-02-28 11:17:38 -08:00
Jean-Baptiste Queru
71431bb5ca am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 
* commit '79b66725b7755e403e10a9d073121789f09b1a9e':
  Fix of tearDown() in SingleLaunchActivityTestCase.
 2011-02-28 11:05:55 -08:00
Jean-Baptiste Queru
79b66725b7 am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 
* commit '25be2c725eba1c94c7fc700e37b194fdcd83a1fb':
  Fix of tearDown() in SingleLaunchActivityTestCase.
 2011-02-28 10:18:30 -08:00
Jean-Baptiste Queru
25be2c725e am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 
* commit 'e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
  Fix of tearDown() in SingleLaunchActivityTestCase.
 2011-02-28 10:15:46 -08:00
Jean-Baptiste Queru
e0537f1859 Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 2011-02-28 10:12:08 -08:00
Xavier Ducrohet
b732b7b5e8 am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt." 
* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
 2011-02-28 10:10:38 -08:00
Xavier Ducrohet
ce57a7f353 am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt." 
* commit '6504490cde3ec5d48321d539e654d1f2072b33f9':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
 2011-02-28 09:51:38 -08:00