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
Scott Main
d4f9872cb0 am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 
* commit 'dc0ae0cb9752c6d6150593da2dccf39abbe6b095':
  docs: add info about manifest attributes that should not change
 2011-06-22 18:13:03 -07:00
Raphael Moll
f9705ef6d3 am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit '2b5f2d01558ba338042f486c754f63873c4061fe':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 18:05:22 -07:00
Scott Main
dc0ae0cb97 am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 
* commit '138836adc7e28e66984fdc20d22688d4da561c15':
  docs: add info about manifest attributes that should not change
 2011-06-22 17:53:12 -07:00
Scott Main
138836adc7 Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 2011-06-22 17:45:13 -07:00
Raphael Moll
2b5f2d0155 am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 17:44:29 -07:00
Raphael Moll
e2b41b0d5c Merge "Laoutlib_creator: keep original of delegate methods." 2011-06-22 17:11:27 -07:00
Scott Main
9fc3579cab docs: add info about manifest attributes that should not change 
Change-Id: Ia58d855ccaa3348bc0a2f7a4b7847ec115c442e8
 2011-06-22 15:57:37 -07:00
Jerry J. Wang
4333de2a8e am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 
* commit 'a5342f1a63559e03b64b93c36b3b1e4b69d2990f':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
 2011-06-22 15:15:31 -07:00
Jerry J. Wang
a5342f1a63 am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 
* commit '850aaaeff6df3c1c6e9cec5ae67225bb57728e0e':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
 2011-06-22 15:11:04 -07:00
Jerry J. Wang
850aaaeff6 Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 2011-06-22 15:08:25 -07:00
Scott Main
d65fab3de6 am e2f74aec: am 929cba13: docs: remove exclamation from media title 
* commit 'e2f74aeca91ae514510f7ee1828eff43b3a2d0f7':
  docs: remove exclamation from media title
 2011-06-22 14:58:04 -07:00
Katie McCormick
023622997d am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL. 
* commit 'a108223fb6a622d977c90b1097f71c867238619e':
  Doc change: updated TOC for Bluetooth CL.
 2011-06-22 14:49:03 -07:00
Scott Main
e2f74aeca9 am 929cba13: docs: remove exclamation from media title 
* commit '929cba1391432eb66329781c866c92a07d3f45ae':
  docs: remove exclamation from media title
 2011-06-22 14:46:43 -07:00
Katie McCormick
a108223fb6 am d4fac2c0: Doc change: updated TOC for Bluetooth CL. 
* commit 'd4fac2c0263fda4b20f253edd594cf909e61eb4e':
  Doc change: updated TOC for Bluetooth CL.
 2011-06-22 14:43:36 -07:00
Scott Main
929cba1391 docs: remove exclamation from media title 
Change-Id: If89584a6b52c6a0e70e6636e1da260b47c0ca072
 2011-06-22 14:43:14 -07:00
Scott Main
dba7dd71f2 am 6f2bcc4d: am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2 
* commit '6f2bcc4db12ec224bad83f89f8efe92f9585caed':
  docs: use new CSE to show results for all sites
 2011-06-22 14:28:53 -07:00
Katie McCormick
d4fac2c026 Doc change: updated TOC for Bluetooth CL. 
Change-Id: Ifd60e332d3088402e939fc851374800f526f8cdf
 2011-06-22 14:28:29 -07:00
Scott Main
6f2bcc4db1 am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2 
* commit '24ef1aa672cc15984df7cccc5115fdda3ac85f58':
  docs: use new CSE to show results for all sites
 2011-06-22 14:26:10 -07:00
Scott Main
24ef1aa672 Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2 2011-06-22 14:23:22 -07:00
Scott Main
702a6caa20 docs: use new CSE to show results for all sites 
Change-Id: Idd85d78fcdd90381b6f03406a76b13e02d540e37
 2011-06-22 13:58:32 -07:00
Robert Ly
b6f9e5dd96 am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
* commit '60506b4f68a081ec7169fccee5926bc092fe2a67':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
 2011-06-22 13:02:48 -07:00
Robert Ly
60506b4f68 am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
* commit 'd60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
 2011-06-22 12:52:25 -07:00
Robert Ly
d60e1b5b91 cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968
 2011-06-22 12:44:02 -07:00
Dave Burke
0b62c2a6e0 Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE) 
Change-Id: If63fdda72a4399e264eed85e2e190c00f383a52d
 2011-06-22 20:18:18 +01: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
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