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

49630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Irfan Sheriff
267a6181a5 Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2 2011-06-21 14:23:17 -07:00
Irfan Sheriff
bc4ddef479 Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 2011-06-21 14:23:09 -07:00
Jaikumar Ganesh
f50ef6a43d am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit '9e5d0de9a333683533a021e9733e824cac666d18':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-21 14:08:29 -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
Bruno Oliveira
a62f707da2 am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 
* commit 'f1c71771a2164ed0009ef9b22f9c03bd3b1af3f9':
  Integrating RandomMusicPlayer sample into tree.
 2011-06-21 11:17:12 -07:00
Bruno Oliveira
f1c71771a2 am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 
* commit 'da61eab862dabe00f95c784a01c019e4f7776b23':
  Integrating RandomMusicPlayer sample into tree.
 2011-06-21 11:11:18 -07:00
Bruno Oliveira
da61eab862 Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 2011-06-21 11:07:47 -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
Scott Main
69ff6a47c6 am a6632992: am 04295266: add api level 13 flag for docs 
* commit 'a6632992135cf25b273abf7f239d7d378c936007':
  add api level 13 flag for docs
 2011-06-21 10:42:41 -07:00
Scott Main
a663299213 am 04295266: add api level 13 flag for docs 
* commit '04295266b03f3c588b8be6b6be409d59f757b27b':
  add api level 13 flag for docs
 2011-06-21 10:31:09 -07:00
Scott Main
04295266b0 add api level 13 flag for docs 
Change-Id: I03a7739c923b1f38de6b4e77374daed438559548
 2011-06-21 10:17:18 -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
Daniel Sandler
e89d4b5d69 am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2 
* commit 'e0da3f3bc9aaefbf3e3737b69e91b7823f639751':
  Fix crazy notification panel background.
 2011-06-20 17:34:33 -07:00
Scott Main
fe8e2fb32f am de937ac0: am bb64fa1e: docs: fix a couple typos 
* commit 'de937ac00900de7d9c3f15328778647401eb836e':
  docs: fix a couple typos
 2011-06-20 17:32:40 -07:00
Daniel Sandler
e0da3f3bc9 am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2 
* commit '444336dd5f233c59e5a222d366d2498c888664b5':
  Fix crazy notification panel background.
 2011-06-20 17:30:38 -07:00
Scott Main
35837c3234 am 20fe290e: am beeb7762: docs: fix broken link 
* commit '20fe290e2c9fdaca94eb334187daf971796afd0d':
  docs: fix broken link
 2011-06-20 17:30:15 -07:00
Daniel Sandler
444336dd5f Merge "Fix crazy notification panel background." into honeycomb-mr2 2011-06-20 17:29:24 -07:00
Scott Main
de937ac009 am bb64fa1e: docs: fix a couple typos 
* commit 'bb64fa1e3dde8910397d159eaa300c4444b0073c':
  docs: fix a couple typos
 2011-06-20 17:28:41 -07:00
Scott Main
20fe290e2c am beeb7762: docs: fix broken link 
* commit 'beeb776209446ea45252af5bbc1fe8a463b2001b':
  docs: fix broken link
 2011-06-20 17:26:48 -07:00
Scott Main
bb64fa1e3d docs: fix a couple typos 
Change-Id: I65e9b59eb48985f21eeea5d0d944b0d8e8b92023
 2011-06-20 17:22:50 -07:00
Scott Main
beeb776209 docs: fix broken link 
Change-Id: I5ac2eed824cef817d309b4e4794c430882db5de8
 2011-06-20 17:17:39 -07:00
Robert Greenwalt
e813ea5a11 am 4906376f: Just a random fix. 
* commit '4906376f58d617083034c5899d06a73b7c1cc114':
  Just a random fix.
 2011-06-20 16:46:20 -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
4906376f58 Just a random fix. 
Don't re-lookup something - use the local holding the early lookup.

Change-Id: I6d9fac89651c99a84060238c8a6f6a936b1167ea
 2011-06-20 14:15:56 -07:00
Conley Owens
587e9563d6 am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" 
* commit 'c1b62e3ba91d69dd75569b480aec55be8f808331':
  Check if we are in daylight time when calculating timezone
 2011-06-20 13:20:49 -07:00
Conley Owens
c1b62e3ba9 am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" 
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
  Check if we are in daylight time when calculating timezone
 2011-06-20 13:04:45 -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
b427f0e696 Merge "Fix tethering upstream determination." into honeycomb-LTE 2011-06-20 11:47:49 -07:00
Daniel Sandler
f1dd26b6fd Fix crazy notification panel background. 
The compatibility mode dialog (shown only once, ever) was clobbering its layout params.

Bug: 4723617
Change-Id: I7899293b72c8e480a97a10a88f62754ff415f343
 2011-06-20 14:44:35 -04: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
Conley Owens
bf5adfa5e5 Merge "Check if we are in daylight time when calculating timezone" 2011-06-20 11:01:41 -07:00
Robert Ly
b2dba9910b am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit 'd1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-20 09:51:08 -07:00
Robert Ly
5520ec6f89 am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit '152e5f56762c9db80d2b65fda8b13e3914f05d86':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-20 09:50:39 -07:00
Robert Ly
d1a19b10ef am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit 'c7c1ba5071456a813abbdadfdbe94287b06877e7':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-20 09:44:59 -07:00
Robert Ly
152e5f5676 am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit '329e0b9020f3b8cd1265c265cdf00b438960cbe1':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-20 09:44:55 -07:00
Robert Ly
c7c1ba5071 Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 2011-06-20 09:37:51 -07:00
Robert Ly
329e0b9020 Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 2011-06-20 09:37:36 -07:00
Jean-Baptiste Queru
49b7338514 am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility" 
* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21':
  Tweaks for forward-compatibility
 2011-06-20 09:14:31 -07:00
Jean-Baptiste Queru
ff3ead5072 am e3b05d09: Merge "Tweaks for forward-compatibility" 
* commit 'e3b05d09163257b888c86f2a560e10c48f4cf029':
  Tweaks for forward-compatibility
 2011-06-20 09:05:07 -07:00
Jean-Baptiste Queru
e3b05d0916 Merge "Tweaks for forward-compatibility" 2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
84d0ccf16c Tweaks for forward-compatibility 
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
 2011-06-18 09:42:04 -07:00
Raphael Moll
865c3bef54 Laoutlib_creator: keep original of delegate methods. 
For specific methods, Layoublib_create can rewrite the implementation
of a method to invoke a delegate instead of the original code. This
allows layoutlib to implement native code or override existing behavior.

This patch also 'saves' the original implementation of a rewritten
method so that the delegate can access the original implementation
as needed. Obviously this is only done for non-native methods.

Given a non-native SomeClass.MethodName, we generate 2 methods:
- A copy of the original method named "SomeClass.MethodName_original".
  The content is the original method as-is from the reader.
- A brand new implementation of SomeClass.MethodName which calls to a
  non-existing method named "SomeClass_delegate.MethodName".
  The implementation of this 'delegate' method is done in layoutlib_brigde.

Change-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6
 2011-06-17 19:07:13 -07:00