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

49605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bruno Oliveira
ecf161437e am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit '0310f4dad3b6ab8b050f6072050dc80374abafc2':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-22 11:21:09 -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
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
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
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
446a436cf3 am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 
* commit '4d9261fad3e3bdfa056f377c10f2af0a6db62542':
  Use dataConnectionNotInUse to decide if a DC is free.
 2011-06-21 19:37:46 -07:00
Wink Saville
66c37f5df2 am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 
* commit '64a09341d8a16212855b7cdd16fe079e25d45838':
  Fix handling of unsol_data_state_change with PDP sharing scenario
 2011-06-21 19:35:22 -07:00
Wink Saville
47e319247e am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 
* commit 'aef70d3f73eec5b28e1255027f947d95a74b6ab9':
  Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
 2011-06-21 19:35:09 -07:00
Wink Saville
1773120c1e am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE 
* commit 'ac4ff8958eced1c56a2e9571dd754c98eaa43108':
  Special retry back-off timer in call setup failure.
 2011-06-21 19:34:54 -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
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