Robert Greenwalt
868d4c3410
am 95023066: DO NOT MERGE Sanitize WifiConfigs
...
* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:09:13 -08:00
Mike Lockwood
2c7b913e36
am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
...
* commit '5daec5b58a89779b0f8775f52859bae0bda17b23':
UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:38:25 +00:00
Mike Lockwood
5daec5b58a
Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
2014-02-25 15:35:34 +00:00
Robert Greenwalt
950230663f
DO NOT MERGE Sanitize WifiConfigs
...
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2
Conflicts:
core/java/android/net/LinkProperties.java
services/java/com/android/server/WifiService.java
wifi/java/android/net/wifi/WifiStateMachine.java
2014-02-24 15:20:32 -08:00
rich cannings
0c9bd3ed4d
Make FORCE_STOP_PACKAGES "signature|system"
...
Bug: 12992556
Change-Id: Iebc91aabb67034e8a5ada7efdcdaaed4cc6d0f1b
(cherry picked from commit 4b7510cf842fdadf1b7e8e0495ded1b2bbd50d7e)
2014-02-24 21:00:58 +00:00
Scott Main
b26117aca0
am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
...
* commit '25b44ae684295b53ac7ba15d827fc03c51aee37b':
add android studio to launch procedures
2014-02-22 00:47:08 +00:00
Scott Main
25b44ae684
Merge "add android studio to launch procedures" into klp-docs
2014-02-22 00:43:26 +00:00
Baligh Uddin
810267c309
am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '28009e8102aa91294362cc2d7770cab73d02e640':
Import translations. DO NOT MERGE
2014-02-20 18:33:18 +00:00
Baligh Uddin
8ca432c782
am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c2803d473ad180fa70e5000f0607795c92c4035d':
Import translations. DO NOT MERGE
2014-02-20 18:33:13 +00:00
Baligh Uddin
28009e8102
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 18:31:03 +00:00
Baligh Uddin
c2803d473a
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 18:30:49 +00:00
Baligh Uddin
1af20cc576
am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '554b43a066b6a084dbb9b7dba014de4b12ba1175':
Import translations. DO NOT MERGE
2014-02-20 18:03:38 +00:00
Baligh Uddin
f887a67dbd
am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'aa20b27472552ebc812dfbb3cbe260115ee43db1':
Import translations. DO NOT MERGE
2014-02-20 17:59:50 +00:00
Baligh Uddin
8027100fdb
am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e9adafd1b95a7934bb813cb168e33a85a762a504':
Import translations. DO NOT MERGE
2014-02-20 17:59:47 +00:00
Baligh Uddin
e69b7b3474
am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e':
Import translations. DO NOT MERGE
2014-02-20 17:59:45 +00:00
Baligh Uddin
554b43a066
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 17:59:40 +00:00
Baligh Uddin
aa20b27472
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 17:55:33 +00:00
Baligh Uddin
e9adafd1b9
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 17:55:23 +00:00
Baligh Uddin
46a02249d7
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 17:55:13 +00:00
Xavier Ducrohet
55542ee644
am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
...
* commit '3e6370425ea3ac4e5d89ce042512913062212ccc':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-02-20 17:42:58 +00:00
Deepanshu Gupta
e92c8542a5
am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
...
* commit '01825b7aa3c864426c78c08c2f6004a8362c2b47':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-02-20 17:42:54 +00:00
Xavier Ducrohet
3e6370425e
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
2014-02-20 17:41:08 +00:00
Baligh Uddin
6fb89ba641
Import translations. DO NOT MERGE
...
Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
Auto-generated-cl: translation import
2014-02-19 22:16:02 -08:00
Baligh Uddin
dab7a9ed70
Import translations. DO NOT MERGE
...
Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
Auto-generated-cl: translation import
2014-02-19 22:08:21 -08:00
Baligh Uddin
b3425a65aa
Import translations. DO NOT MERGE
...
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
2014-02-19 19:42:43 -08:00
Baligh Uddin
da799ef3a0
Import translations. DO NOT MERGE
...
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
2014-02-19 18:54:52 -08:00
Baligh Uddin
69046bb06c
Import translations. DO NOT MERGE
...
Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b
Auto-generated-cl: translation import
2014-02-19 18:49:33 -08:00
Baligh Uddin
8807558c32
Import translations. DO NOT MERGE
...
Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
Auto-generated-cl: translation import
2014-02-19 18:45:30 -08:00
Scott Main
24a8e1d0e9
am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs
...
* commit 'af87e19bdbf6b16240dcdbfd31fe4f33eca4e51d':
update intent examples for maps bug: 12661490 bug: 12957723
2014-02-20 02:17:20 +00:00
Scott Main
af87e19bdb
Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs
2014-02-20 02:14:40 +00:00
Scott Main
8ad4275640
update intent examples for maps
...
bug: 12661490
bug: 12957723
Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
2014-02-19 18:08:33 -08:00
Deepanshu Gupta
01825b7aa3
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
...
For these font families, text was always rendered as italic. This
changeset fixes the issue.
Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
2014-02-19 20:17:47 +00:00
Deepanshu Gupta
13aea18b34
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
...
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.
Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
2014-02-19 20:17:00 +00:00
Mike Lockwood
c62f918e0e
UsbDeviceManager: Fix race condition entering USB accessory mode
...
When switching USB modes there are often spurious connect and disconnect events
that occur before reenumeration is complete. There is currently a 1000ms timer
to "debounce" the disconnect events. But with some USB accessories, this timeout
is not long enough, which results in an endless cycle of attempts to enter
USB accessory mode when the phone is connected.
To fix this, we now wait up to 10 seconds for the host to successfully configure
the device when entering USB accessory mode before giving up.
This is separate from the existing debounce timer, so the behavior of the
USB state change broadcasts are not affected.
Bug: 12877769
Change-Id: I7aa61f8a618546d749a7ddfc97bf103029a73d03
2014-02-19 11:23:19 -08:00
John Spurlock
998735652d
am ba231fca: Fix bad @links in PendingIntent.java
...
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
Fix bad @links in PendingIntent.java
2014-02-19 13:44:14 +00:00
John Spurlock
ba231fcabf
Fix bad @links in PendingIntent.java
...
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
2014-02-18 13:19:57 -05:00
Dirk Dougherty
257f67249a
am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
...
* commit '35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:44:38 +00:00
Dirk Dougherty
35cb4e4936
Doc change: add new samples TOC groups and landing pages.
...
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
2014-02-12 19:38:51 -08:00
Scott Main
d5251a387e
add android studio to launch procedures
...
Change-Id: Ic0d923478babf3de2b0cb31b26d57884ea886d7b
2014-02-12 17:14:42 -08:00
Dirk Dougherty
55362018c9
am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
...
* commit '271c8f12c88e87563ed17f4ad29610037bd300be':
Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:30:19 +00:00
Dirk Dougherty
271c8f12c8
Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
2014-02-12 23:20:41 +00:00
Joe Fernandez
3885b00ae1
am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
MediaRouter Developer Guide
2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59
Merge "MediaRouter Developer Guide" into klp-docs
2014-02-12 23:13:01 +00:00
Joe Fernandez
70a2adc817
MediaRouter Developer Guide
...
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html
Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
2014-02-12 14:12:15 -08:00
Ricardo Cervera
36547014a3
am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
...
* commit '670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
docs: Added missing elements in uses-feature. Bug: 12913153
2014-02-12 21:56:29 +00:00
Ricardo Cervera
bff7db19e3
am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
...
* commit '521a54d0cc5288c4467652f4d773f372eebe970b':
docs: Added notes for Build Tools Revision 19.0.2
2014-02-12 21:56:27 +00:00
Ricardo Cervera
566e4df8c3
am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
...
* commit 'ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
docs: Added Revision 3 of Google APIs System Image.
2014-02-12 21:56:24 +00:00
Dirk Dougherty
3155825c25
Doc change: minor edits to support easier extraction of document summaries.
...
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
2014-02-12 13:31:14 -08:00
Ricardo Cervera
670944aa72
Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
2014-02-12 21:05:32 +00:00
Ricardo Cervera
521a54d0cc
Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
2014-02-12 21:04:40 +00:00