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

109692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
6d64d5ab84 Merge "Add missing InsetDrawable.getDrawable() method" 2013-07-31 00:54:25 +00:00
Selim Gurun
d608b0e97c Merge "Update cleanspec" 2013-07-30 23:35:40 +00:00
Selim Gurun
35d2e33136 Update cleanspec 
Fix build break in master-chromium branch due to a forgotten cleanspec.

Change-Id: If377c53bf3a82bff775f968ad8eb270e3c666837
 2013-07-30 16:31:12 -07:00
Jonathan Dixon
dad2c6e3fa Merge "Add some logging when the webview dev setting changes" 2013-07-30 23:29:57 +00:00
Jonathan Dixon
cb64bb4b16 Add some logging when the webview dev setting changes 
Bug: 9773865

This will not be visible in shipping config, so shouldn't be a major
source of log spam.

Change-Id: If09734b70e59aeab87c6dddee72212aa6748505f
 2013-07-30 16:21:32 -07:00
Jean-Baptiste Queru
cb9accefb1 am 46aae98b: am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter." 
* commit '46aae98b41fe6e6b61aeddff3ad3f41bc4ceace3':
  Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
 2013-07-30 15:34:26 -07:00
Jean-Baptiste Queru
46aae98b41 am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter." 
* commit 'f2d643cfc7405c1f771cacab365a0a5d9b547f36':
  Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
 2013-07-30 15:32:19 -07:00
Jean-Baptiste Queru
f2d643cfc7 Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter." 2013-07-30 22:24:15 +00:00
Jean-Michel Trivi
8847633fc4 Merge "Focus loss value takes into account previous loss" 2013-07-30 21:46:13 +00:00
Jean-Michel Trivi
53e6e287ff Focus loss value takes into account previous loss 
Implement a state machine to represent how to transition to the
 next audio focus loss state, given the current focus loss (state)
 and the given external focus gain (transition).

Bug 8315302

Change-Id: I4a3d5a4a53c842caceaa876206a993c4e5446681
 2013-07-30 14:21:34 -07:00
Dianne Hackborn
967032b764 Merge "Report more memory tuning info." 2013-07-30 21:21:02 +00:00
Elliott Hughes
58b5057c6e am c40e46e8: am bfe1b801: Merge "Update preloaded-classes" 
* commit 'c40e46e8413c112186eadc8526d20306d81c9008':
  Update preloaded-classes
 2013-07-30 14:10:43 -07:00
Elliott Hughes
c40e46e841 am bfe1b801: Merge "Update preloaded-classes" 
* commit 'bfe1b801831ce875a164ad95a07ab03c307e986e':
  Update preloaded-classes
 2013-07-30 14:08:34 -07:00
Elliott Hughes
bfe1b80183 Merge "Update preloaded-classes" 2013-07-30 21:04:56 +00:00
Sungmin Choi
66fe96aa65 Update preloaded-classes 
Change-Id: I42247e498ad532e3f4699bc87c0d314cde74e3f6
 2013-07-30 13:50:27 -07:00
Romain Guy
84956d53f1 Add missing InsetDrawable.getDrawable() method 
Change-Id: I216b0e8a327f495fd83ebac79013418dbae007b9
 2013-07-30 13:01:40 -07:00
Dianne Hackborn
805f52d4cf Report more memory tuning info. 
Change-Id: I243d67189e325eba5ea22e79937f5a858dfceeed
 2013-07-30 12:48:12 -07:00
Wink Saville
f2c89b9ed6 am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00" 
* commit '9516ed4598948eea5623c57e443bce08c1f48ab6':
  Add support for MNC=00
 2013-07-30 12:28:05 -07:00
Wink Saville
9516ed4598 am cfc23ac6: Merge "Add support for MNC=00" 
* commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc':
  Add support for MNC=00
 2013-07-30 12:24:39 -07:00
Wink Saville
cfc23ac688 Merge "Add support for MNC=00" 2013-07-30 19:19:47 +00:00
Jean-Michel Trivi
fec4a907b1 Merge "Audio focus request managed by FocusRequester class" 2013-07-30 18:54:48 +00:00
Elliott Hughes
5d6e487e43 am f0589d8f: am 8cf1f446: Merge "fix typo: Remove dulplicated comment line" 
* commit 'f0589d8fc78f7994cd49c64485f51f446c499259':
  fix typo: Remove dulplicated comment line
 2013-07-30 11:48:36 -07:00
Elliott Hughes
f0589d8fc7 am 8cf1f446: Merge "fix typo: Remove dulplicated comment line" 
* commit '8cf1f4465bada6b25b47b7d72dc15d216c89de80':
  fix typo: Remove dulplicated comment line
 2013-07-30 11:45:25 -07:00
Eino-Ville Talvala
92ed645159 Merge "Camera2 API: Rename package to android.hardware.camera2" 2013-07-30 18:42:20 +00:00
Elliott Hughes
8cf1f4465b Merge "fix typo: Remove dulplicated comment line" 2013-07-30 18:38:00 +00:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2 
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
 2013-07-30 11:37:31 -07:00
Sungmin Choi
f8e0017cdb fix typo: Remove dulplicated comment line 
Change-Id: I6b95998b4af5b27c7e1f9040aa5e7b7deb5d8609
 2013-07-30 11:31:19 -07:00
Jean-Michel Trivi
783cea4658 Merge "More refactor of audio focus, keep track of focus loss" 2013-07-30 18:31:13 +00:00
Jean-Michel Trivi
83283f23eb Audio focus request managed by FocusRequester class 
Move all audio focus request functionality under a new class/file.
Clean up encapsulation of data related to the request.

Change-Id: I989796e1ee1a5fc99799a64e1612294e0e40fa6d
 2013-07-30 11:27:08 -07:00
Alan Viverette
39dd5a62ae Merge "Implement drag to open overflow menu, lift to select" 2013-07-30 18:04:43 +00:00
Alan Viverette
f45bdaf512 Merge "Don't show spinner popup if adapter is null" 2013-07-30 18:04:18 +00:00
Romain Guy
56fbb6362b Merge "Add path ops API" 2013-07-30 17:53:05 +00:00
Romain Guy
8018c8db82 Add path ops API 
Path ops can be used to combine two paths instances in a single path
object. The following operations can be used:

- Difference
- Reverse difference
- Union
- XOR
- Intersection

To use the API:

Path p1 = createCircle();
Path p2 = createRect();

Path result = new Path();
result.op(p1, p2, Path.Op.DIFFERENCE);

This code will subtract the rectangle from the circle and generate
the resulting path in "result."

Change-Id: Ic25244665b6691a7df0b0002a09da73d937b553b
 2013-07-30 10:51:24 -07:00
Marco Nelissen
4d4a137bf5 am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 
* commit '51cf3661fa658d7cec6a08ed3f916ce98203027c':
  MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
 2013-07-30 10:28:38 -07:00
Lorenzo Colitti
e7c9482015 am cc4bee55: am 8fcad020: Merge "Make legacy VPN work over stacked interfaces." 
* commit 'cc4bee55fa58193073f5ba5ccebc0cc24fdb45c7':
  Make legacy VPN work over stacked interfaces.
 2013-07-30 10:28:35 -07:00
Lorenzo Colitti
997405be19 am 6c3e7b5f: am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point" 
* commit '6c3e7b5f0578aee0c49fa2bd4c1ba2572a9d0726':
  464xlat: use a gatewayed route, not point-to-point
 2013-07-30 10:28:32 -07:00
Jean-Baptiste Queru
d248b0a4de am c2314cf5: am e700a36e: Merge "Update getCheckedItemPositions() documentation" 
* commit 'c2314cf5f4efa2cc767e0069dcc2a67e12d7cd20':
  Update getCheckedItemPositions() documentation
 2013-07-30 10:28:24 -07:00
Marco Nelissen
51cf3661fa am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 
* commit 'f38b528701fd9bfd06adb2c9aeb7d5f951647312':
  MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
 2013-07-30 10:17:08 -07:00
Marco Nelissen
f38b528701 Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 2013-07-30 17:11:55 +00:00
Lorenzo Colitti
cc4bee55fa am 8fcad020: Merge "Make legacy VPN work over stacked interfaces." 
* commit '8fcad020e0c256be1948e42df19d43f53f9f5804':
  Make legacy VPN work over stacked interfaces.
 2013-07-30 09:57:21 -07:00
Lorenzo Colitti
6c3e7b5f05 am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point" 
* commit '158840079a501784c76e9816b215b3a1839074ef':
  464xlat: use a gatewayed route, not point-to-point
 2013-07-30 09:57:18 -07:00
Yorke Lee
6acfa5d567 Add URI and fields for new pinned position API in ContactsContract. 
Change-Id: I947e49212750e0042a806d8f16817dc65597f45c
 2013-07-30 09:52:36 -07:00
Lorenzo Colitti
8fcad020e0 Merge "Make legacy VPN work over stacked interfaces." 2013-07-30 16:50:41 +00:00
Lorenzo Colitti
158840079a Merge "464xlat: use a gatewayed route, not point-to-point" 2013-07-30 16:50:05 +00:00
Jean-Baptiste Queru
c2314cf5f4 am e700a36e: Merge "Update getCheckedItemPositions() documentation" 
* commit 'e700a36e4041a921f880a7c3c5ec6ce96c955a92':
  Update getCheckedItemPositions() documentation
 2013-07-30 09:22:51 -07:00
Jean-Baptiste Queru
e700a36e40 Merge "Update getCheckedItemPositions() documentation" 2013-07-30 16:16:38 +00:00
Lorenzo Colitti
bc8f82fb1f Make legacy VPN work over stacked interfaces. 
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).

Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.

Bug: 9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
 2013-07-31 01:14:30 +09:00
Lorenzo Colitti
efa73c05f7 464xlat: use a gatewayed route, not point-to-point 
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.

Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:

default dev clat4  scope link

to:

default via 192.0.0.4 dev clat4  scope link
192.0.0.4 dev clat4  scope link

and those apps now work.

Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
 2013-07-31 01:09:53 +09:00
Baligh Uddin
4ac7a5b42b Merge "Import translations. DO NOT MERGE" 2013-07-30 15:59:34 +00:00
Baligh Uddin
c5bb50bdf4 Merge "Import translations. DO NOT MERGE" 2013-07-30 15:59:00 +00:00