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

47872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
44ff718f62 Data Retry fix after failure due to permanent causes. 
Change-Id: I86d5a2dc9394dac93c4350159f4d99cf19aedec9
 2011-04-01 14:45:49 -07:00
Mike Lockwood
43707a83ec UsbManager: minor Javadoc tweak 
Change-Id: I44efc54cd2a0991465aabe0ecea1b8a3291014c2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-01 17:28:45 -04:00
Robert Greenwalt
92d72ca01b Fix bad merge. 
Add host route for a default gateway before adding the default route.
Also fixing bug were "already active" condtion of APN failed to
propagate the default gateway info, resulting in a loss of that address.

bug:4175328
Change-Id: I38f9d108693382a43e6605d56ca3963adf4eb6f4
 2011-04-01 14:11:30 -07:00
Jason parks
78a9766be2 Merge "Implement teardown script." into gingerbread 2011-04-01 13:11:06 -07:00
Jason parks
ab8f48c2ee Implement teardown script. 
Change-Id: I1a3feda3b1007b08fcaa24c3f8dd21abf1efd885
 2011-04-01 14:41:18 -05:00
Jeff Hamilton
84d340781b Make the NFC UID forward compatible. 
Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
 2011-04-01 13:43:28 -05:00
Mike Lockwood
1c56976a77 am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:37:05 -07:00
Mike Lockwood
38f04c0f28 am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:34:39 -07:00
Mike Lockwood
11dd5ae97b Improve Javadoc for USB Manager and MTP/PTP support. 
Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-01 14:11:50 -04:00
Wink Saville
7c6f532ae9 am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE 
* commit 'dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
  Airplane mode on always timed out when camping on LTE
 2011-04-01 10:32:37 -07:00
Wink Saville
4aff3e363c am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma. 
* commit '0198fff90430d9f974b0284fc3659434406c751b':
  Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
 2011-04-01 10:30:44 -07:00
Wink Saville
dacb80901d Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE 2011-04-01 10:28:22 -07:00
Wink Saville
95bc2b7564 Airplane mode on always timed out when camping on LTE 
While on LTE, GsmDataConnectionTracker is implicitly associated with CdmaServiceTracker.
CdmaServiceTracker asynchronously waits for the disconnection of data before turning off
the Radio but GsmDataConnection does not notify the disconnection due to different logic
in GsmServiceTracker.

This fix is to have common airplane mode toggle logic on both GSM and CDMA flavors.

Change-Id: I67ff82a59a2243856ae3e7c5e37b5726bcbf3c94
 2011-04-01 10:11:18 -07:00
Wink Saville
0198fff904 Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma. 
This allows the system property to be updated at runtime and
for testing.

Change-Id: I75788e5fa70efdbb9186b9f03baac1d9e6b3febd
 2011-04-01 08:53:12 -07:00
Mårten Kongstad
57f4b77c89 Runtime resource overlay, iteration 1. 
Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.

This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.

This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.

Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
 2011-04-01 14:12:10 +02:00
Jean-Baptiste Queru
789d4ade29 ignore from gingerbread-plus-aosp 
Change-Id: I80fc76acaa18aae7b313bb19489f277ce4700368
 2011-03-31 20:08:04 -07:00
Scott Main
efbdbdedeb am 77de14d6: am 1ccdc235: am e979332f: docs: fix markup bugs 
* commit '77de14d64f1b2a36a117869d412a3a74e6823cd7':
  docs: fix markup bugs
 2011-03-31 19:14:00 -07:00
Scott Main
77de14d64f am 1ccdc235: am e979332f: docs: fix markup bugs 
* commit '1ccdc235716715e7c6f13cab42e4195454e04615':
  docs: fix markup bugs
 2011-03-31 19:10:56 -07:00
Scott Main
1ccdc23571 am e979332f: docs: fix markup bugs 
* commit 'e979332f38e677db4c9d89f695352ed41052553d':
  docs: fix markup bugs
 2011-03-31 19:06:33 -07:00
Russell Brenner
9e57a4df48 am 7b445dd7: am 49b49f8f: Added include/private/hwui/DrawGlInfo.h 
* commit '7b445dd7c0814a39eaf912fa1a871f00d5190550':
  Added include/private/hwui/DrawGlInfo.h
 2011-03-31 19:00:35 -07:00
Russell Brenner
64802ca780 am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable 
* commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
  Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
 2011-03-31 18:55:26 -07:00
Russell Brenner
7b445dd7c0 am 49b49f8f: Added include/private/hwui/DrawGlInfo.h 
* commit '49b49f8fb6d094768d4e093353b34271f2da1bfc':
  Added include/private/hwui/DrawGlInfo.h
 2011-03-31 18:55:20 -07:00
Russell Brenner
c6b22e2727 Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable 
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
 2011-03-31 17:40:08 -07:00
Scott Main
e979332f38 docs: fix markup bugs 
Change-Id: I230d16e6dc0fe166a61a30a92b2666e0856298a0
 2011-03-31 17:08:24 -07:00
Wink Saville
2a936154f6 am b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE 
* commit 'b90f9c370e5b1b1825016e48b864e8eda6d5f89c':
  Telephony: Add Powerdown Cause to PDP Deactivate Message.
 2011-03-31 15:52:58 -07:00
Wink Saville
b90f9c370e Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE 2011-03-31 15:51:07 -07:00
Wink Saville
261306889e Telephony: Add Powerdown Cause to PDP Deactivate Message. 
Modem needs to know if PDP deactivation is due to UE power down so that it can do detach.

Change-Id: Ie63f90f005845fcd6bfab421f193058b6e2e78d5
 2011-03-31 15:46:25 -07:00
Russell Brenner
49b49f8fb6 Added include/private/hwui/DrawGlInfo.h 
Change-Id: If50ccabb8761a994fa1f7aef4fbdb668c6160b0c
 2011-03-31 13:20:52 -07:00
Wink Saville
cac1411e99 am 11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE 
* commit '11feacb348e624bcdbb073a32c1fc1d8bdc7bae3':
  Telephony: Cleanup of SIM handling in CdmaLteSST.
 2011-03-31 13:19:06 -07:00
Wink Saville
11feacb348 Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE 2011-03-31 13:16:41 -07:00
James Dong
ea5d2c5844 Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread 2011-03-31 11:20:40 -07:00
Glenn Kasten
69250839bb am 4ed59de6: am ffa670b5: Bug 4167061 
* commit '4ed59de640e46e42b5af3d79448be9da6e79667d':
  Bug 4167061
 2011-03-31 11:08:52 -07:00
Glenn Kasten
4ed59de640 am ffa670b5: Bug 4167061 
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
  Bug 4167061
 2011-03-31 11:06:41 -07:00
Robert Greenwalt
026ba931d4 Merge "Fix the build." into honeycomb-plus-aosp 2011-03-31 10:47:32 -07:00
Robert Greenwalt
b1c6b0f1e2 Fix the build. 
Fix a bad merge.

Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
 2011-03-31 10:44:47 -07:00
Wink Saville
72ec108b0c am b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 
* commit 'b136aa6c9a1c043ff91357cea9e0b6597c904507':
  Telephony: Update LTE RILConstants to match ril.h
 2011-03-31 10:26:12 -07:00
Wink Saville
b136aa6c9a Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 2011-03-31 10:23:11 -07:00
Glenn Kasten
ffa670b5b0 Bug 4167061 
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
 2011-03-30 18:50:41 -07:00
Dianne Hackborn
fd10e6ac58 am a5b308e7: am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit 'a5b308e74c44722b9414fa9be52eabacd23029b2':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:53:44 -07:00
Dianne Hackborn
a5b308e74c am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
  Expand screen documentation with explicit screen size dimensions.
 2011-03-30 17:50:29 -07:00
Dianne Hackborn
53df89c74f Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 2011-03-30 17:43:17 -07:00
James Dong
8a1a0fd1dc When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE. 
Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32
related-to-bug: 4195127
 2011-03-30 16:30:00 -07:00
Dianne Hackborn
2f98f26708 Expand screen documentation with explicit screen size dimensions. 
This updates the various documentation on screen sizes to discuss
the exact screen dimensions that are now associated with each size.
In addition, the screen sizes vs. densities table is updated to
include a number of additional representative screens.

Change-Id: Id07491148b1857e0265cef7139e564e190f38e03
 2011-03-30 16:19:02 -07:00
Justin Ho
0b39731431 am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 16:00:50 -07:00
Justin Ho
0b251aec43 am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024
 2011-03-30 15:59:19 -07:00
Justin Ho
01b13a11e6 Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 2011-03-30 15:57:42 -07:00
Trevor Johns
f9784a5051 am f829305f: am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'f829305f8706e32fa103e5ee9eef7c595642d1a2':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:30:56 -07:00
Trevor Johns
f829305f87 am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'e1cc88ccaf5fec2671c2f50bd850e7c56b03f286':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:29:10 -07:00
Trevor Johns
e1cc88ccaf am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'eb344a69fa728c010425fb1e18fc8f5774693986':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:26:38 -07:00
Andreas Huber
399792b831 am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:22:57 -07:00