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

17274 Commits

Author SHA1 Message Date
Wink Saville
a736cd54e1 am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
 2011-07-08 09:40:03 -07:00
Wink Saville
8735a07a64 No need to have BASE_DATA_CONNECTION_TRACKER start at 50000. 
Update comment that values should be changed after releasing.

Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
 2011-07-07 14:16:30 -07:00
Robert Greenwalt
37dbfcaf83 am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
  Added methods to support dns cache per interface
 2011-07-06 07:48:21 -07:00
Robert Greenwalt
2b62c4fbfe am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface
 2011-07-06 07:35:02 -07:00
Robert Greenwalt
38bb0123b8 Merge "Added methods to support dns cache per interface" 2011-07-01 09:26:50 -07:00
Dianne Hackborn
06ca9b90e6 am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:43:44 -07:00
Dianne Hackborn
fa5e3b658f am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:26:17 -07:00
Dianne Hackborn
83e0bc18e0 DO NOT MERGE. Fix density compat mode. 
Fix issue #4770360: older app compatibility mode is really tiny on ICS phones

We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
 2011-06-23 12:29:03 -07:00
Irfan Sheriff
1cc0fa416f am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit 'db45e0bdd02c2b9416b89999422561929feb5cc0':
  Release wakelock after use
 2011-06-22 11:21:12 -07:00
Irfan Sheriff
a08c552083 am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit '38053dad9f8b988a162fba89545f4f7b8a09d34c':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-22 11:21:05 -07:00
Irfan Sheriff
5389c80d1f am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE 
* commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
 2011-06-22 11:19:09 -07:00
Irfan Sheriff
db45e0bdd0 am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit 'ecce539f3d739fbf4b395639a485fddf51f688d6':
  Release wakelock after use
 2011-06-22 11:10:26 -07:00
Irfan Sheriff
38053dad9f am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit '41b35884ff68a62f5fc8f65dcc26342d0889113d':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-22 11:10:16 -07:00
Irfan Sheriff
cf99765b62 resolved conflicts for merge of 914ed90f to honeycomb-LTE 
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
 2011-06-22 11:01:16 -07:00
Irfan Sheriff
20b6ded6e3 am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
 2011-06-22 07:47:16 -07:00
Irfan Sheriff
c74eacde30 resolved conflicts for merge of 267a6181 to honeycomb-LTE 
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
 2011-06-22 07:11:42 -07:00
Irfan Sheriff
cd672ebf29 Release wakelock after use 
DHCP renewal can finish pretty quick most times and holding
a timed wakelock wastes battery.

Hold a non-reference counted lock and release it immediate
while having the safety of a 40s release

Bug: 4575773
Change-Id: I49d2e8c27b2723690aef26417c4b9a145843a401
 2011-06-21 15:42:48 -07:00
Irfan Sheriff
e8898d4a44 am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 
* commit '885c3c11cf1e20c456ddf681a06a4a878426a632':
  DO NOT MERGE Revert "Fix lease duration handling"
 2011-06-21 14:44:13 -07:00
Irfan Sheriff
885c3c11cf am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 
* commit 'bc4ddef479011e200d0273fe73c22922a85de1fe':
  DO NOT MERGE Revert "Fix lease duration handling"
 2011-06-21 14:29:42 -07:00
Irfan Sheriff
41b35884ff Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
This reverts commit 7dd120058972226158176b292c00841efecc259f.
 2011-06-21 14:26:59 -07:00
Irfan Sheriff
914ed90f2c Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" 
This reverts commit 58d1bb497e0d83e28a02fbcdc1f33f29a992db7e.
 2011-06-21 14:26:37 -07:00
Jaikumar Ganesh
9e5d0de9a3 am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit 'b38fa2a0ac2bde56504929de6a3dd61ac723958e':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-21 13:24:46 -07:00
Irfan Sheriff
58d1bb497e DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine" 
This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
 2011-06-21 11:38:23 -07:00
Jaikumar Ganesh
b38fa2a0ac Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 2011-06-21 11:23:51 -07:00
Irfan Sheriff
7dd1200589 DO NOT MERGE Revert "Fix lease duration handling" 
This reverts commit 56878760c3f0255dbcc8d78572f784b96ee36cb0.
 2011-06-21 11:01:54 -07:00
Jaikumar Ganesh
d762f063be DO NOT MERGE Incoming Bluetooth Connection requests - dialog. 
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
 2011-06-21 09:27:12 -07:00
Nick Pelly
6ce7039482 am 6f1a8edc: am 17523abb: NFC Adapter Extras API update. 
* commit '6f1a8edcc00db40a8ad300e15a23f7f1de298c3b':
  NFC Adapter Extras API update.
 2011-06-20 15:58:40 -07:00
Nick Pelly
6f1a8edcc0 am 17523abb: NFC Adapter Extras API update. 
* commit '17523abb45b7f77f35af53e895d74be13f2314e0':
  NFC Adapter Extras API update.
 2011-06-20 15:54:07 -07:00
Robert Greenwalt
7a652bc86a resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp 
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
 2011-06-20 12:15:24 -07:00
Robert Greenwalt
ccf83af101 Fix tethering upstream determination. 
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116

Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
 2011-06-20 11:09:23 -07:00
Nick Pelly
17523abb45 NFC Adapter Extras API update. 
Remove
o registerTearDownApdus()
o deregisterTearDownApdus()
They were already NO-OPS, and don't work in the general case.

Add
o authenticate(byte[] token)
This future proofs us for a more flexible access control scheme.

Change-Id: I4cb67ceeb63d61cbc333c9b244a96d8687402168
 2011-06-17 14:51:40 -07:00
Dianne Hackborn
872a1e793c am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating along the way. 
* commit '9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
  SDK only: integrate new sample code, deprecating along the way.
 2011-06-16 15:25:22 -07:00
Dianne Hackborn
9a73c4d3a9 am 2f04883f: SDK only: integrate new sample code, deprecating along the way. 
* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
  SDK only: integrate new sample code, deprecating along the way.
 2011-06-16 15:22:10 -07:00
Dianne Hackborn
2f04883ff8 SDK only: integrate new sample code, deprecating along the way. 
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it.  This also means there is
no longer any use in ActivityGroup or LocalActivityManager.  Yay.

Also fix up things so the new support API demos are included in
the documentation.

Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
 2011-06-16 14:52:00 -07:00
Robert Greenwalt
241b65aca9 am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE 
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
  Reset connections AFTER we take down the network.
 2011-06-16 12:42:15 -07:00
Robert Greenwalt
5f3505121b Merge "Reset connections AFTER we take down the network." into honeycomb-LTE 2011-06-16 11:34:03 -07:00
Robert Greenwalt
ec896c6a86 Reset connections AFTER we take down the network. 
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.

bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
 2011-06-16 11:26:54 -07:00
Dianne Hackborn
f28f1de391 am 413b53b5: am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2 
* commit '413b53b57d62b60e98cfe5b9359551315e7cb3a7':
  We must keep up with the Joneses.
 2011-06-15 17:12:45 -07:00
Dianne Hackborn
413b53b57d am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2 
* commit '70921d615496c5be8a19cbd1454378bb7d0201f3':
  We must keep up with the Joneses.
 2011-06-15 17:10:33 -07:00
Dianne Hackborn
0d4b9c993d We must keep up with the Joneses. 
Change-Id: Ifa2ab0167c09ba18b24c8b6c618db807e17519f5
 2011-06-15 15:09:54 -07:00
Irfan Sheriff
1195487228 am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d':
  Fix lease duration handling
 2011-06-15 14:07:54 -07:00
Irfan Sheriff
5af3405f0d am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
  Fix lease duration handling
 2011-06-15 14:04:23 -07:00
Irfan Sheriff
56878760c3 Fix lease duration handling 
Convert lease time in seconds to long before alarm
set up and add sanity check

Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
 2011-06-15 12:58:18 -07:00
Dianne Hackborn
27bad6f33b am baa89d38: am f930232f: Fix a major problem in fragment lifecycle. 
* commit 'baa89d3839f70bd31e5219c636ac24a4cc29928d':
  Fix a major problem in fragment lifecycle.
 2011-06-14 20:57:48 -07:00
Dianne Hackborn
baa89d3839 am f930232f: Fix a major problem in fragment lifecycle. 
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
  Fix a major problem in fragment lifecycle.
 2011-06-14 20:54:40 -07:00
Dianne Hackborn
f930232fd1 Fix a major problem in fragment lifecycle. 
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).

Also, retained fragments that have a target were broken.  Oops.

Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
 2011-06-14 20:47:44 -07:00
Amith Yamasani
2bcd9c6e7b am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 
* commit 'eb5e633a2488456874f829263fa6cb96588d25aa':
  Stability fixes for PreferenceFragments.
 2011-06-14 15:42:36 -07:00
Amith Yamasani
eb5e633a24 am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
  Stability fixes for PreferenceFragments.
 2011-06-14 15:38:31 -07:00
Amith Yamasani
608a200d2e Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 2011-06-14 15:35:13 -07:00
Dianne Hackborn
e95c07bd8a am 7c7f8e18: am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2 
* commit '7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
  Fix issue #4603422: Compatibility mode button doesn't always update
 2011-06-14 15:22:12 -07:00