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

106493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
fe5cd35d2e am ea779669: am 159a5ff7: fix a few bugs. xxhpi bug: 10071401 bitmap code, aosp: 58020 intent code, aosp: 57698 
* commit 'ea7796696e0fd1ff3e1dc576908dcb74342339cb':
  fix a few bugs. xxhpi bug: 10071401 bitmap code, aosp: 58020 intent code, aosp: 57698
 2013-07-30 20:09:48 -07:00
Dirk Dougherty
48de64b465 am ad8ae220: am 2ffbfba5: Doc change: fix typo. 
* commit 'ad8ae2205cfee61edf595d22c342ad9a6c121e50':
  Doc change: fix typo.
 2013-07-30 20:09:45 -07:00
Scott Main
3048395252 am 1d7516a7: am ec6f327e: update sizes/sums for tools 22.0.5 release also update platform version number for doc builds 
* commit '1d7516a79883dded43e6c370bf071feb9527971e':
  update sizes/sums for tools 22.0.5 release also update platform version number for doc builds
 2013-07-30 20:09:42 -07:00
Dirk Dougherty
8b4b3de172 am 524c3dbd: am 37ec3374: Doc change: add v7 mediarouter lib to index and feature summary, with preview notice. 
* commit '524c3dbd8142f42201b28ba412e245cfe6b10a2f':
  Doc change: add v7 mediarouter lib to index and feature summary, with preview notice.
 2013-07-30 20:09:38 -07:00
Dirk Dougherty
94393dc35e am 658d76c8: am c88e0211: Merge "Doc change: clean up doc and fix image url." into jb-mr2-docs 
* commit '658d76c8938d113b9f0daca7eb9f83674c94a725':
  Doc change: clean up doc and fix image url.
 2013-07-30 20:09:35 -07:00
Scott Main
d3c50bd01c am a11d164e: am ca0f5e63: Merge "docs: SDK / ADT 22.0.5 Release Notes" into jb-mr2-docs 
* commit 'a11d164eff028ad1988341a1ecccbfdabdc5b378':
  docs: SDK / ADT 22.0.5 Release Notes
 2013-07-30 20:09:32 -07:00
Dirk Dougherty
3cfa94a196 am d1ac96b1: am d9065a5c: Doc change: fix typo. 
* commit 'd1ac96b1f6c3c1b5dee7b5ea91c0be6b81db1592':
  Doc change: fix typo.
 2013-07-30 20:09:28 -07:00
Dirk Dougherty
ccf61c267e am fc7172e6: am 44632232: Doc change: add gpg developer stories. 
* commit 'fc7172e6d2efb514d367976d462ca8a5116120cf':
  Doc change: add gpg developer stories.
 2013-07-30 20:09:25 -07:00
Roman Nurik
6c5c31d159 am 502aea1e: am df16ce48: Under-the-hood improvements to Device Art Generator. 
* commit '502aea1e988423bd0674244cecccfab7abc77fa3':
  Under-the-hood improvements to Device Art Generator.
 2013-07-30 20:09:22 -07:00
Scott Main
0255d2c430 am 50c7f772: am 02dcb55a: add "download" id to which the page scrolls when beginning ndk download 
* commit '50c7f77267b7b4fd476a15c172ce9385b0981116':
  add "download" id to which the page scrolls when beginning ndk download
 2013-07-30 20:09:19 -07:00
Joe Fernandez
bd6ace699c am 50bbc0ca: am 465c7c26: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: NDK r9 Release Notes (w/download size fix) 
* commit '50bbc0ca84caf504dcc1b5e0fb58919dce5b917b':
  DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: NDK r9 Release Notes (w/download size fix)
 2013-07-30 20:09:16 -07:00
Joe Fernandez
d014c9c02b am c743b29e: am 7ec2cc57: docs: fix link bug in Support LIbrary Guide 
* commit 'c743b29e69e5571cdacae9ce350d3c010f35309f':
  docs: fix link bug in Support LIbrary Guide
 2013-07-30 20:09:13 -07:00
Scott Main
ea7796696e am 159a5ff7: fix a few bugs. xxhpi bug: 10071401 bitmap code, aosp: 58020 intent code, aosp: 57698 
* commit '159a5ff708063d92a6be4ed12c7a3c9d85dec1e1':
  fix a few bugs. xxhpi bug: 10071401 bitmap code, aosp: 58020 intent code, aosp: 57698
 2013-07-30 20:05:46 -07:00
Dirk Dougherty
ad8ae2205c am 2ffbfba5: Doc change: fix typo. 
* commit '2ffbfba5ad2f5cf0290eb04cae0db4f636dcb0da':
  Doc change: fix typo.
 2013-07-30 20:05:44 -07:00
Scott Main
1d7516a798 am ec6f327e: update sizes/sums for tools 22.0.5 release also update platform version number for doc builds 
* commit 'ec6f327ed092f4ad9d919e4e622a13862e932a43':
  update sizes/sums for tools 22.0.5 release also update platform version number for doc builds
 2013-07-30 20:05:40 -07:00
Dirk Dougherty
524c3dbd81 am 37ec3374: Doc change: add v7 mediarouter lib to index and feature summary, with preview notice. 
* commit '37ec33741c5840ce1ae370aa1279215f94075b3a':
  Doc change: add v7 mediarouter lib to index and feature summary, with preview notice.
 2013-07-30 20:05:37 -07:00
Dirk Dougherty
658d76c893 am c88e0211: Merge "Doc change: clean up doc and fix image url." into jb-mr2-docs 
* commit 'c88e0211bc0c0b1a6e9e963ba7850cd39b8e232c':
  Doc change: clean up doc and fix image url.
 2013-07-30 20:05:35 -07:00
Scott Main
a11d164eff am ca0f5e63: Merge "docs: SDK / ADT 22.0.5 Release Notes" into jb-mr2-docs 
* commit 'ca0f5e63327cb5dac57112438056e46cdce0d836':
  docs: SDK / ADT 22.0.5 Release Notes
 2013-07-30 20:05:31 -07:00
Dirk Dougherty
d1ac96b1f6 am d9065a5c: Doc change: fix typo. 
* commit 'd9065a5cc0da6a17c915374d7fc7c9c5e4a63f9e':
  Doc change: fix typo.
 2013-07-30 20:05:29 -07:00
Dirk Dougherty
fc7172e6d2 am 44632232: Doc change: add gpg developer stories. 
* commit '446322323cefa7ab8aec33ade7fe4083ec76d67c':
  Doc change: add gpg developer stories.
 2013-07-30 20:05:27 -07:00
Roman Nurik
502aea1e98 am df16ce48: Under-the-hood improvements to Device Art Generator. 
* commit 'df16ce481cf1c8a1aef37133d72f5794c56a5a8b':
  Under-the-hood improvements to Device Art Generator.
 2013-07-30 20:05:23 -07:00
Scott Main
50c7f77267 am 02dcb55a: add "download" id to which the page scrolls when beginning ndk download 
* commit '02dcb55a2265c59c793bc1c1c7cdadb4cf0573ae':
  add "download" id to which the page scrolls when beginning ndk download
 2013-07-30 20:05:21 -07:00
Joe Fernandez
50bbc0ca84 am 465c7c26: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: NDK r9 Release Notes (w/download size fix) 
* commit '465c7c2610d7afc1741081a6d54f38e51647f1ff':
  DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: NDK r9 Release Notes (w/download size fix)
 2013-07-30 20:05:19 -07:00
Joe Fernandez
c743b29e69 am 7ec2cc57: docs: fix link bug in Support LIbrary Guide 
* commit '7ec2cc57dfff215dd8db784dccf5a52649fafefc':
  docs: fix link bug in Support LIbrary Guide
 2013-07-30 20:05:17 -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
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
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
Scott Main
159a5ff708 fix a few bugs. 
xxhpi bug: 10071401
bitmap code, aosp: 58020
intent code, aosp: 57698

Change-Id: Ice59c52d095d1e173918cae692368bf0f6636a14
 2013-07-30 12:15:16 -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
Elliott Hughes
8cf1f4465b Merge "fix typo: Remove dulplicated comment line" 2013-07-30 18:38:00 +00:00
Sungmin Choi
f8e0017cdb fix typo: Remove dulplicated comment line 
Change-Id: I6b95998b4af5b27c7e1f9040aa5e7b7deb5d8609
 2013-07-30 11:31:19 -07:00
Dirk Dougherty
2ffbfba5ad Doc change: fix typo. 
Change-Id: I0fad0ddc945362bf260ca2eb247eb9077244c6ae
 2013-07-30 10:46:50 -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
Scott Main
ec6f327ed0 update sizes/sums for tools 22.0.5 release 
also update platform version number for doc builds

Change-Id: Ib3e644c3bfe618137516398aebf3f778ebdd1e81
 2013-07-30 10:10:22 -07:00
Dirk Dougherty
37ec33741c Doc change: add v7 mediarouter lib to index and feature summary, with preview notice. 
Change-Id: I23e4bdec971a982f545c4118b5c154a8949170cf
(cherry picked from commit a32db2f12d2eae0440b575bfd006ee83967ef61c)
 2013-07-30 17:07:18 +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
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
Michael Wright
c0dbd255ae am b7dfa027: Merge "Remove deleted keylayout from Makefile" 
* commit 'b7dfa02766fef8c32f6217f427a47ad519d1d9f0':
  Remove deleted keylayout from Makefile
 2013-07-29 19:31:34 -07:00
Michael Wright
b7dfa02766 Merge "Remove deleted keylayout from Makefile" 2013-07-30 02:26:01 +00:00