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

52568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
dd65ed25c4 am 92593dc4: am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE 
* commit '92593dc49b348c4951037a1ae2fa17bb6644ffb9':
  Clear IP configuration on lost network
 2011-06-08 17:31:58 -07:00
Adam Powell
fb339016ff am 73d54e7b: am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '73d54e7b54f95401ad290bf9d305cad449db7ae3':
  Public styles for action bar tabs
 2011-06-08 17:16:16 -07:00
Xavier Ducrohet
45b662e1bc Merge 06942bc4 from hc-mr1. 
Layoutlib - use the new getParser callback when possible.

Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
 2011-06-08 17:11:40 -07:00
Xavier Ducrohet
beb5fb622b Merge 988eeeb5 from hc-mr1. 
Support for custom declare-styleable attr with enum/flag in layoutlib.

Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
 2011-06-08 17:10:11 -07:00
Andreas Huber
e6510eb935 am 752a5b3d: (-s ours) am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '752a5b3df55da655792d382025171d94073e05f9':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-08 17:03:17 -07:00
Martijn Coenen
e5141eef50 am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit '4c5f2a9dd26674be797e1cb7c995247601096a04':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-08 17:03:05 -07:00
Jeff Brown
0a2f6640de Make orientation changes happen sooner. 
Tweaked the window orientation listener to be less conservative
in its filtering.  Should shave a couple hundred milliseconds
off the rotation time.

Change-Id: If7dd5114b0941df6199fe81080ac94730cf797cf
 2011-06-08 16:58:59 -07:00
Adam Powell
73d54e7b54 am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
  Public styles for action bar tabs
 2011-06-08 16:58:35 -07:00
Adam Powell
4381f6421c Merge "Public styles for action bar tabs" into honeycomb-mr2 2011-06-08 16:54:50 -07:00
Mathias Agopian
2c0042b666 Fix a leak in RefBase 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Id85e749ba04521199555dd701198edd097c313d4
 2011-06-08 16:25:01 -07:00
Mathias Agopian
19974eccdb Fix a leak in RefBase (DO NOT MERGE) 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
 2011-06-08 16:13:39 -07:00
Romain Guy
873057b3be Merge "Remove obsolete code." 2011-06-08 16:10:33 -07:00
Romain Guy
66e9af6c54 Remove obsolete code. 
Change-Id: I2f990528bdc0dc6127f367e55c55287d43dd29f9
 2011-06-08 16:09:28 -07:00
Andreas Huber
fddf5d9f48 Make dumpsys(media.player) more useful by having AwesomePlayer populate it. 
Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
 2011-06-08 16:04:26 -07:00
Andreas Huber
75fd93c0d1 Merge "This device-specific workaround is no longer necessary." 2011-06-08 15:49:34 -07:00
Adam Powell
1a4678b93f Public styles for action bar tabs 
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
 2011-06-08 15:13:50 -07:00
Wink Saville
2d8500d21a am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 
* commit '799f04c09cc7284e0660d419bcb24af57b86f08e':
  Report data status from ApnContext even if data is detached
 2011-06-08 15:03:43 -07:00
Wink Saville
a384ff3282 am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE 
* commit '33e1424b2e924e9b0162aa648137e8254f729161':
  Use CSIM to get provision information
 2011-06-08 15:03:35 -07:00
Wink Saville
799f04c09c Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 2011-06-08 15:00:46 -07:00
Andreas Huber
762b6d001a This device-specific workaround is no longer necessary. 
We can now enable yuv->yuv blitting instead of converting to RGB565.

Change-Id: Ia6a94b706f20a0c9e6ef78a7325cff4f5bb216b8
related-to-bug: 4394005
 2011-06-08 15:00:14 -07:00
Andy McFadden
4a8c478dfa Add a URI for recurring event exceptions 
Part of a larger Calendar provider change.

Bug 4473786

Change-Id: I0cb4260ea590da0c48b55d0ca3ee586e00d37b36
 2011-06-08 14:59:51 -07:00
Wink Saville
33e1424b2e Merge "Use CSIM to get provision information" into honeycomb-LTE 2011-06-08 14:58:53 -07:00
John Wang
de13001f76 am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '1f8665895f71904b9d757854277cb637841356c3':
  Add SIM PUK unlockscreen.
 2011-06-08 14:46:04 -07:00
Martijn Coenen
2dcae567ab Added support for rediscovering a Tag (API). 
Bug: 3378764
Change-Id: I4697b814337270c4458ca2b8ce358de315904777
 2011-06-08 23:26:42 +02:00
Chia-chi Yeh
b539f8d7d5 Merge "The UI part of the user space VPN support." 2011-06-08 14:17:44 -07:00
Chia-chi Yeh
ff3bdca31f The service part of the user space VPN support. 
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
 2011-06-08 14:16:42 -07:00
Jean-Baptiste Queru
ed17165a14 am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" 
* commit '0315a2c5640dc91cd1689db9dff997e43e4effca':
  Tweak setViewport stuff for fwd-compat
 2011-06-08 14:14:56 -07:00
Jean-Baptiste Queru
0315a2c564 am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" 
* commit 'f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
  Tweak setViewport stuff for fwd-compat
 2011-06-08 14:07:19 -07:00
John Wang
1861225be3 am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device. 
* commit 'fe682fd74d96f5a72259aed6dd27c02c8fc7caf7':
  Do not merge. Return null id for Non-phone device.
 2011-06-08 14:04:37 -07:00
Jeff Brown
92110af24a am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 
* commit '5f0b1721eece5ca614044cda638f11fbec0eab0a':
  Fix swipe gesture cosine calculation. Bug: 4124987
 2011-06-08 14:04:33 -07:00
John Wang
fe682fd74d am cea03df2: Do not merge. Return null id for Non-phone device. 
* commit 'cea03df201dc6659654234bc5fbfebf1b6a06e42':
  Do not merge. Return null id for Non-phone device.
 2011-06-08 13:52:26 -07:00
Jeff Brown
5f0b1721ee am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 
* commit '25bd8abce993e17b382ea5c29a1cb68dd095cf45':
  Fix swipe gesture cosine calculation. Bug: 4124987
 2011-06-08 13:52:22 -07:00
Nick Pelly
9eb5847777 Merge "Move NDEF URI helper method into android.nfc.NfcRecord" 2011-06-08 13:44:28 -07:00
Jean-Baptiste Queru
f3894a04ac Merge "Tweak setViewport stuff for fwd-compat" 2011-06-08 13:10:58 -07:00
John Wang
cea03df201 Do not merge. Return null id for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-08 13:10:22 -07:00
Kazuhiro Ondo
2e994586ed Report data status from ApnContext even if data is detached 
While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.

The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.

Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
 2011-06-08 13:05:32 -07:00
Jean-Baptiste Queru
de26719153 Tweak setViewport stuff for fwd-compat 
Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
 2011-06-08 13:00:58 -07:00
Wink Saville
0da86d4fef am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
  Fix default preferred network.
 2011-06-08 12:59:37 -07:00
Kazuhiro Ondo
53f67f7e9d Use CSIM to get provision information 
In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.

Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.

Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
 2011-06-08 12:59:22 -07:00
Wink Saville
a558fdf156 Merge "Fix default preferred network." into honeycomb-LTE 2011-06-08 12:56:27 -07:00
Chet Haase
b19fcf3e9c Merge "Add 'Property' object" 2011-06-08 12:51:06 -07:00
Wink Saville
d6bcfd1cd0 Fix default preferred network. 
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
 2011-06-08 12:18:07 -07:00
Nick Pelly
e0180d053e Move NDEF URI helper method into android.nfc.NfcRecord 
Change-Id: Ia044e45cbe2cd06c4844d15a57f1c1f392cf65cd
 2011-06-08 11:26:11 -07:00
Martijn Coenen
608a23a07e Merge "Implement Felica timeout handling (API)." 2011-06-08 11:04:36 -07:00
Martijn Coenen
a924973f22 Implement Felica timeout handling (API). 
Allows controlling the timeout for transceive on Felica.

Change-Id: I5c62b3ea0e8a16bc006feac6ec759cdb730bc938
 2011-06-08 20:00:02 +02:00
James Dong
7d6143a9f0 Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition 
This can potentially save lot of memory for video recording use case since the video encoder
can advertise a much smaller size of the input buffers which are allocated by SF by default.

Change-Id: I582a356cd02c7852e13f2713d90ad5f1eb43177d
 2011-06-08 10:38:26 -07:00
Robert Greenwalt
081977e493 Merge "resolved conflicts for merge of e139167c to master" 2011-06-08 10:29:13 -07:00
Robert Greenwalt
8a02401129 resolved conflicts for merge of e139167c to master 
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
 2011-06-08 10:01:06 -07:00
Mike Lockwood
007fc721ed Merge "MTP: Remove obsolete setPtpMode support" 2011-06-08 09:43:02 -07:00
Mike Lockwood
523510e9b7 Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast" 2011-06-08 09:42:54 -07:00