OSDN Git Service
David Friedman [Tue, 4 Mar 2014 04:25:38 +0000 (04:25 +0000)]
Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev
Yorke Lee [Tue, 4 Mar 2014 04:09:04 +0000 (04:09 +0000)]
am
81479358: Reword the "Quick contacts not available" string
* commit '
81479358decb0a2cefbb8245e0f56ed0e966d697':
Reword the "Quick contacts not available" string
Scott Main [Tue, 4 Mar 2014 03:08:18 +0000 (03:08 +0000)]
am
0109047d: update google play badge AI files, v2.
* commit '
0109047de1d68f7e911ae8d39f70330f5dbcd642':
update google play badge AI files, v2.
Scott Main [Wed, 26 Feb 2014 19:54:44 +0000 (11:54 -0800)]
update google play badge AI files, v2.
Change-Id: If74ae8cace0e82e81deede459b7bbf862a266ce7
Yorke Lee [Tue, 10 Dec 2013 17:51:40 +0000 (09:51 -0800)]
Reword the "Quick contacts not available" string
Bug:
12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit
89b366fa95f625275f1b94d800d22998f942ab8c)
Scott Main [Tue, 4 Mar 2014 02:47:51 +0000 (02:47 +0000)]
am
4a5a2392: Merge "dashboard update for march \'14" into klp-docs
* commit '
4a5a23920e1a3414f1c87e3cf4c9bce08fddac4f':
dashboard update for march '14
Scott Main [Tue, 4 Mar 2014 02:45:25 +0000 (02:45 +0000)]
Merge "dashboard update for march '14" into klp-docs
David Friedman [Wed, 19 Feb 2014 06:08:05 +0000 (22:08 -0800)]
NDK r9d: Incorporates all review comments, final file sizes.
Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html
Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
Ricardo Cervera [Tue, 4 Mar 2014 01:10:51 +0000 (01:10 +0000)]
am
240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs
* commit '
240b38aafb05407a147fceefed13df33c19aa2b2':
docs: Changes to release notes for the Android SDK 22.6.0 release.
Ricardo Cervera [Tue, 4 Mar 2014 01:07:52 +0000 (01:07 +0000)]
Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs
Ricardo Cervera [Tue, 25 Feb 2014 20:01:27 +0000 (12:01 -0800)]
docs: Changes to release notes for the Android SDK 22.6.0 release.
Updated relese notes for 22.6.0:
Stage:
http://quixote.mtv.corp.google.com:8001/sdk/index.html
http://quixote.mtv.corp.google.com:8001/sdk/installing/installing-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/eclipse-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/tools-notes.html
http://quixote.mtv.corp.google.com:8001/tools/revisions/build-tools.html
(Patch: Cleared md5 and ZIP entries. To be updated with values for
the final build when available.)
(Patch: Added emulator bugfixes from Xav.)
(Patch: Addressed Joe's comments. Added filenames and checksums for the
rc7 build)
(Patch: Replaced sizes and hashes with values for rc8)
(Patch: Added lint categories, addressed Joe's comments)
(Patch: Added note on the lint issue)
(Patch: Addressed Joe's comments, reverted adt-bundle-* to
20131030 files.)
Change-Id: I508d47959c4f478a3ed6b927fd460139cd5cfe36
Dirk Dougherty [Mon, 3 Mar 2014 22:13:31 +0000 (22:13 +0000)]
am
cce121fb: Merge "Update permission description string." into klp-docs
* commit '
cce121fb7504fbc460b85564735ff5d8a1ed4d55':
Update permission description string.
Dirk Dougherty [Mon, 3 Mar 2014 22:10:26 +0000 (22:10 +0000)]
Merge "Update permission description string." into klp-docs
Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]
Update permission description string.
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
Scott Main [Mon, 3 Mar 2014 20:17:17 +0000 (12:17 -0800)]
dashboard update for march '14
Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c
Jay Shrauner [Mon, 3 Mar 2014 21:58:47 +0000 (21:58 +0000)]
am
4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
* commit '
4ef0aabe93877b7f30645b873fbc003651151f2f':
Catch ActivityNotFoundException in quick contacts badge
Jay Shrauner [Mon, 3 Mar 2014 21:56:17 +0000 (21:56 +0000)]
Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
Jonathan Dixon [Mon, 3 Mar 2014 18:54:35 +0000 (18:54 +0000)]
am
efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
* commit '
efe1b2402abd6f26f6483533b68983475f6e6144':
DO NOT MERGE: Fix build after checkThread fix merge to master
Bart Sears [Mon, 3 Mar 2014 18:50:25 +0000 (18:50 +0000)]
am
4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
* commit '
4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
Jonathan Dixon [Thu, 10 Oct 2013 00:28:13 +0000 (17:28 -0700)]
DO NOT MERGE: Fix build after checkThread fix merge to master
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.
Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit
b212b9f2ba709273b3d46a1ef3b091eb2292c917)
Cherry pick to klp-dev as part of Bug:
13246014
Bart Sears [Mon, 3 Mar 2014 18:42:27 +0000 (18:42 +0000)]
Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
Primiano Tucci [Thu, 5 Sep 2013 11:01:51 +0000 (12:01 +0100)]
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
See: b/
10629847
Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of
244267500254daff8745f8c0fae3edcac735873f)
Cherry pick to klp-dev as part of Bug:
13246014
Conflicts:
core/java/android/webkit/WebViewClassic.java
core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit
54daaf1cffddad6366fac2ccfceb1e042dd8e90e)
Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
rich cannings [Mon, 3 Mar 2014 17:21:58 +0000 (17:21 +0000)]
am
8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev
* commit '
8ebfbffcbb86123a54dd7979b26525eec30d77b9':
Make FORCE_STOP_PACKAGES "signature|system"
rich cannings [Mon, 3 Mar 2014 17:19:00 +0000 (17:19 +0000)]
Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev
John Spurlock [Mon, 3 Mar 2014 16:57:22 +0000 (16:57 +0000)]
am
8c44c394: Doc fixups to ContentResolver, MediaRouter.
* commit '
8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
Doc fixups to ContentResolver, MediaRouter.
John Spurlock [Mon, 3 Mar 2014 15:14:41 +0000 (10:14 -0500)]
Doc fixups to ContentResolver, MediaRouter.
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
Yorke Lee [Sat, 7 Dec 2013 00:35:29 +0000 (16:35 -0800)]
Catch ActivityNotFoundException in quick contacts badge
Bug:
12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit
4fc601a650405bfba99bcd40429376113bd9492a)
Paul Lawrence [Thu, 27 Feb 2014 22:24:42 +0000 (22:24 +0000)]
am
7ab82a0c: am
657dbc40: am
b3776881: am
8b916936: am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
7ab82a0c602956251be9dd5539208af9cfecea33':
Prevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Thu, 27 Feb 2014 22:24:39 +0000 (22:24 +0000)]
am
9395f63a: am
55cab009: (-s ours) am
9272db02: am
c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
9395f63aa5a386088ad93e3e226ef333084c5b74':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 22:21:05 +0000 (22:21 +0000)]
am
657dbc40: am
b3776881: am
8b916936: am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
657dbc40427c17cbf31be1a17cf2fa7a4116722a':
Prevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Thu, 27 Feb 2014 22:21:01 +0000 (22:21 +0000)]
am
55cab009: (-s ours) am
9272db02: am
c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
55cab009f0c9b1939f8336e26144850a5fdc9d3a':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 20:04:07 +0000 (12:04 -0800)]
am
b3776881: am
8b916936: am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
b37768816cd9c530dcbb3a8f51d87536406a975b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 20:00:08 +0000 (12:00 -0800)]
am
8b916936: am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
8b91693683895a8b148f6ffea8944cef2ba8d99b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:55:10 +0000 (11:55 -0800)]
am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
2e582d1379fa78e2693269d76d2bcd763bfbfba1':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:44:37 +0000 (11:44 -0800)]
am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:40:21 +0000 (11:40 -0800)]
am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
08ee74b1f1c4df28faa4168114853836cc471095':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:38:01 +0000 (11:38 -0800)]
am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
ea5586ef7fc29463f8144931c2c43261d15043b1':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:28:43 +0000 (11:28 -0800)]
am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
4be7c61a339f8200527f6df5a7b2215c96f81b4b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:24:05 +0000 (11:24 -0800)]
am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
5677513b7c46ca08a7fa34b9d227d7a448db6757':
Prevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Thu, 27 Feb 2014 19:22:53 +0000 (11:22 -0800)]
am
9272db02: am
c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
9272db024d013fbb48ec476c77562ab31d75a461':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:20:24 +0000 (11:20 -0800)]
am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
Prevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Thu, 27 Feb 2014 19:17:11 +0000 (11:17 -0800)]
am
c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:16:49 +0000 (11:16 -0800)]
am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Wed, 26 Feb 2014 23:42:34 +0000 (15:42 -0800)]
Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
This is a backport of
5bab9daf3cf66f4de19f8757e386030e8bef23ce
Bug:
7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
Carlos Valdivia [Sun, 29 Sep 2013 12:11:56 +0000 (05:11 -0700)]
Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
Bug:
7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit
5bab9daf3cf66f4de19f8757e386030e8bef23ce)
Robert Greenwalt [Tue, 25 Feb 2014 18:18:05 +0000 (18:18 +0000)]
am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
43ec3b939b732ea2d3b26635c51a6c91f2692270':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:14:26 +0000 (18:14 +0000)]
am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:12:35 +0000 (10:12 -0800)]
am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
868d4c341034de6e2ebb6c1a247488b00d17c78d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:09:13 +0000 (10:09 -0800)]
am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
950230663fb3a9af438ec2ee57605fc9e7a58428':
DO NOT MERGE Sanitize WifiConfigs
Mike Lockwood [Tue, 25 Feb 2014 15:38:25 +0000 (15:38 +0000)]
am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
5daec5b58a89779b0f8775f52859bae0bda17b23':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:35:33 +0000 (15:35 +0000)]
Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
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
rich cannings [Wed, 12 Feb 2014 21:24:25 +0000 (13:24 -0800)]
Make FORCE_STOP_PACKAGES "signature|system"
Bug:
12992556
Change-Id: Iebc91aabb67034e8a5ada7efdcdaaed4cc6d0f1b
(cherry picked from commit
4b7510cf842fdadf1b7e8e0495ded1b2bbd50d7e)
Scott Main [Sat, 22 Feb 2014 00:47:08 +0000 (00:47 +0000)]
am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
25b44ae684295b53ac7ba15d827fc03c51aee37b':
add android studio to launch procedures
Scott Main [Sat, 22 Feb 2014 00:43:26 +0000 (00:43 +0000)]
Merge "add android studio to launch procedures" into klp-docs
Baligh Uddin [Thu, 20 Feb 2014 18:33:18 +0000 (18:33 +0000)]
am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
28009e8102aa91294362cc2d7770cab73d02e640':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:33:13 +0000 (18:33 +0000)]
am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c2803d473ad180fa70e5000f0607795c92c4035d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:30:49 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:03:38 +0000 (18:03 +0000)]
am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
554b43a066b6a084dbb9b7dba014de4b12ba1175':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:50 +0000 (17:59 +0000)]
am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
aa20b27472552ebc812dfbb3cbe260115ee43db1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:47 +0000 (17:59 +0000)]
am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e9adafd1b95a7934bb813cb168e33a85a762a504':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:45 +0000 (17:59 +0000)]
am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
46a02249d7bde3fb88cc5312f88dab6d1690e20e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:40 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:32 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:23 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:13 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Xavier Ducrohet [Thu, 20 Feb 2014 17:42:58 +0000 (17:42 +0000)]
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]
Deepanshu Gupta [Thu, 20 Feb 2014 17:42:54 +0000 (17:42 +0000)]
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]
Xavier Ducrohet [Thu, 20 Feb 2014 17:41:07 +0000 (17:41 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 06:16:02 +0000 (22:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 06:08:21 +0000 (22:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 03:42:43 +0000 (19:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:54:52 +0000 (18:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:49:33 +0000 (18:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:45:30 +0000 (18:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
Auto-generated-cl: translation import
Scott Main [Thu, 20 Feb 2014 02:17:20 +0000 (02:17 +0000)]
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
Scott Main [Thu, 20 Feb 2014 02:14:40 +0000 (02:14 +0000)]
Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
Scott Main [Sat, 15 Feb 2014 02:37:24 +0000 (18:37 -0800)]
update intent examples for maps
bug:
12661490
bug:
12957723
Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
Deepanshu Gupta [Wed, 19 Feb 2014 18:53:27 +0000 (10:53 -0800)]
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)
Deepanshu Gupta [Wed, 19 Feb 2014 19:05:02 +0000 (11:05 -0800)]
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)
Mike Lockwood [Wed, 19 Feb 2014 19:18:02 +0000 (11:18 -0800)]
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
John Spurlock [Wed, 19 Feb 2014 13:44:14 +0000 (13:44 +0000)]
am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
Fix bad @links in PendingIntent.java
John Spurlock [Tue, 18 Feb 2014 18:19:57 +0000 (13:19 -0500)]
Fix bad @links in PendingIntent.java
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
Dirk Dougherty [Thu, 13 Feb 2014 03:44:38 +0000 (03:44 +0000)]
am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Sat, 8 Feb 2014 05:05:43 +0000 (21:05 -0800)]
Doc change: add new samples TOC groups and landing pages.
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
Scott Main [Thu, 13 Feb 2014 01:14:42 +0000 (17:14 -0800)]
add android studio to launch procedures
Change-Id: Ic0d923478babf3de2b0cb31b26d57884ea886d7b
Dirk Dougherty [Wed, 12 Feb 2014 23:30:19 +0000 (23:30 +0000)]
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.
Dirk Dougherty [Wed, 12 Feb 2014 23:20:40 +0000 (23:20 +0000)]
Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
Joe Fernandez [Wed, 12 Feb 2014 23:15:50 +0000 (23:15 +0000)]
am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
f25bc75f591fbb04733b9cc33fabee2293973b8c':
MediaRouter Developer Guide
Joe Fernandez [Wed, 12 Feb 2014 23:13:01 +0000 (23:13 +0000)]
Merge "MediaRouter Developer Guide" into klp-docs
Joe Fernandez [Wed, 29 Jan 2014 00:17:44 +0000 (16:17 -0800)]
MediaRouter Developer Guide
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html
Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
Ricardo Cervera [Wed, 12 Feb 2014 21:56:29 +0000 (21:56 +0000)]
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
Ricardo Cervera [Wed, 12 Feb 2014 21:56:27 +0000 (21:56 +0000)]
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
Ricardo Cervera [Wed, 12 Feb 2014 21:56:24 +0000 (21:56 +0000)]
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.
Dirk Dougherty [Sun, 9 Feb 2014 04:29:06 +0000 (20:29 -0800)]
Doc change: minor edits to support easier extraction of document summaries.
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
Ricardo Cervera [Wed, 12 Feb 2014 21:05:31 +0000 (21:05 +0000)]
Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
Ricardo Cervera [Wed, 12 Feb 2014 21:04:40 +0000 (21:04 +0000)]
Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
Ricardo Cervera [Wed, 12 Feb 2014 21:04:00 +0000 (21:04 +0000)]
Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
Ricardo Cervera [Fri, 31 Jan 2014 00:12:51 +0000 (16:12 -0800)]
docs: Added Revision 3 of Google APIs System Image.
Updated Google Play services version to 4.2.42 too.
Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
OSDN Git Service
