Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,521 Commits 3 Branches 0 Tags
db45e0bdd02c2b9416b89999422561929feb5cc0
Commit Graph

48521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bruno Oliveira
0310f4dad3 am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit 'f5c6236289e9f8a7df6af0bea78887ba2cbf406e':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-22 11:10:24 -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
5d5b73be51 Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 2011-06-22 07:27:39 -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
Wink Saville
4d9261fad3 Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 2011-06-21 19:32:36 -07:00
Wink Saville
64a09341d8 Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 2011-06-21 19:32:25 -07:00
Wink Saville
aef70d3f73 Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 2011-06-21 19:32:16 -07:00
Wink Saville
ac4ff8958e Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE 2011-06-21 19:32:05 -07:00
Irfan Sheriff
ecce539f3d Merge "Release wakelock after use" into honeycomb-mr2 2011-06-21 19:17:27 -07:00
Kazuhiro Ondo
7c2d6fd60d Return USIM IMSI as subscriber ID in case of CDMA-LTE mode 
Bug: 4764057
Change-Id: I0c7d6e2af6a597d70d2024205d358e8b9c56b57b
 2011-06-21 18:02:51 -07:00
Wink Saville
d1ec23c206 Use dataConnectionNotInUse to decide if a DC is free. 
Change-Id: I89cb2f46dca59d5738dd16eb657104c3158ebcd2
 2011-06-21 17:58:45 -07:00
Bruno Oliveira
f5c6236289 Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 2011-06-21 16:44:56 -07:00
Kazuhiro Ondo
e0acd0842f Special retry back-off timer in call setup failure. 
RIL might specify a special retry back-off timer only used for
temporary in a certain error scenario. This patch will be adding
new handling of "retry" override so RIL specified retry timer
can be used instead of the pre-configured one.

Bug: 4723641
Change-Id: Ia4784f022a029c79b35c4c4c01ad7e49efd56a3c
 2011-06-21 16:17:03 -07:00
Kazuhiro Ondo
e303d7b318 Fix handling of unsol_data_state_change with PDP sharing scenario 
The original logic was to go through each ApnContext to find
changes on the DataConnection if applicable. This was causing
an issue when an DC is shared by multiple ApnContexts. Only
the first ApnContext associated with the updated DC was detecting
the link properties change.

The change in this patch is to go through the changes by DC instead
of ApnContext. And make sure the update on a DC is propagated to
all associated ApnContexts.

Bug: 4744006
Change-Id: Ie52d62d1d5671005f9e74b1ddc24822c9013e3e4
 2011-06-21 16:14:03 -07:00
Bruno Oliveira
54340961bd Rewriting "Audio and Video" section of Dev Guide. 
Rewriting the "Audio and Video" section of the Dev Guide, renaming it
Media Framework and adding a more details about MediaPlayer,
interaction between MediaPlayer and services, Audio Focus, etc.

Staging:
http://www.corp.google.com/~btco/tmp/offline-sdk/guide/topics/media/index.html

This is a cherrypick of CL 106666 which was originally on honeycomb-mr1.
Link to old CL:
https://android-git.corp.google.com/g/#change,106666

Change-Id: I0efa4c9ed73af7f9dcb02232a6af4a7527645367
 2011-06-21 18:55:46 -04: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
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 7dd1200589.
 2011-06-21 14:26:59 -07:00
Irfan Sheriff
914ed90f2c Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" 
This reverts commit 58d1bb497e.
 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
Irfan Sheriff
58d1bb497e DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine" 
This reverts commit fe3b33d4ea.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
 2011-06-21 11:38:23 -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 56878760c3.
 2011-06-21 11:01:54 -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
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
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
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
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
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
Mathias Agopian
48294b0d93 am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit 'e7d3ee9d81de13e992c7d063ca472d480956b0c6':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:09:56 -07:00
Mathias Agopian
e7d3ee9d81 Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
Also revert all dependent changes:
This reverts commit 8e18668d14.
This reverts commit 69b4587bfb.
This reverts commit a9c9a4baf2.
This reverts commit 2c0042b666.
This reverts commit f6c8206735.
This reverts commit 24855c0917.

Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
 2011-06-16 17:22:28 -07:00
John Wang
c6b32054c6 am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."
 2011-06-16 16:50:05 -07:00
John Wang
c826f92e6f Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 2011-06-16 16:47:18 -07:00
John Wang
fe9aa2706f Revert "Do not merge. Return null id for Non-phone device." 
This reverts commit cea03df201
 2011-06-16 16:30:02 -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