118266 Commits

Author SHA1 Message Date
Raph Levien
a980c7aa3e Merge "Re-initialize error after attach" 2014-01-06 17:00:49 +00:00
John Spurlock
3390018c6b Docfixes: three typos and escape */*.
Change-Id: I418d855b5d08a1a20eaca3d8e4d2e5d0fca23dd5
2014-01-06 11:44:42 -05:00
Narayan Kamath
2ac3cb7aef Fix broken XML parsing idiom.
Code that expected a single top level element in an XML file
was doing something like :

while (type != START_TAG) { next(); }

This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.

bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb
2014-01-06 11:31:35 +00:00
Narayan Kamath
f748257eee XmlUtils#readThisMapXml should handle null keys.
Both readThisValueXml & writeThisValueXml have been
implemented to handle values with "null" names.

Change readThisMapXml to allow such names as well, and
map them to the null key in the resulting HashMap.
readThisListXml and readThisSetXml already support
null names.

bug: https://code.google.com/p/android/issues/detail?id=63463

Change-Id: I1c93976656e45e7733113eb67d29b6bad5d25f1f
2014-01-06 11:18:21 +00:00
Katie McCormick
406fb742f4 am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs
* commit '65f5d74eada8937d68c821ff4f1c609e16613d22':
  Doc update: update console instructions per new UI.
2014-01-03 13:15:23 -08:00
Katie McCormick
65f5d74ead am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs
* commit '048895b5a0532fef394a4a3f07af737f8d733335':
  Doc update: update console instructions per new UI.
2014-01-03 21:12:42 +00:00
Katie McCormick
048895b5a0 Merge "Doc update: update console instructions per new UI." into klp-docs 2014-01-03 21:09:38 +00:00
quddusc
9c1f71966e docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI.
Bug: 7044477

Change-Id: I722dc2e47c8dbe0cba48e44434d62fe28f23714f
2014-01-02 11:47:23 -08:00
Baligh Uddin
bb23697a7e am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit 'd58d91ef8296a75e07fa7b9b78dd6d9f5dd72015':
  Import translations. DO NOT MERGE
2013-12-30 10:49:56 -08:00
Baligh Uddin
d58d91ef82 am 2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca':
  Import translations. DO NOT MERGE
2013-12-30 10:47:12 -08:00
Baligh Uddin
2ae0419fb1 Import translations. DO NOT MERGE
Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
Auto-generated-cl: translation import
2013-12-30 09:30:42 -08:00
Baligh Uddin
ca7a1442d0 am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a95f6e3ac450a8df9ae90585f2c0c02726f9cb01':
  Import translations. DO NOT MERGE
2013-12-26 15:34:23 -08:00
Baligh Uddin
4c60be5b13 am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7aa56efd7399b0628bde655c535fac6407eaade9':
  Import translations. DO NOT MERGE
2013-12-26 15:34:18 -08:00
Baligh Uddin
ad141bd7e2 am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'dd6517c9dff66a2165e147201e813e1f305425c2':
  Import translations. DO NOT MERGE
2013-12-26 15:34:14 -08:00
Baligh Uddin
b6d5591712 am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit 'e965be75746d898611ee15d601dc97c8b206a542':
  Import translations. DO NOT MERGE
2013-12-26 15:34:10 -08:00
quddusc
f16ddd6dd4 am 2a191297: am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '2a1912971849b929dc2e4ec8d6368f477b1fddae':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
2013-12-26 15:34:03 -08:00
quddusc
cd73f7702f am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
* commit '5d98ddf2f741c2a635b9df90cf896c9faceb1b33':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
2013-12-26 15:33:58 -08:00
quddusc
317109dfaf am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs
* commit 'e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
2013-12-26 15:33:52 -08:00
quddusc
b889885e9b am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs
* commit '34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
2013-12-26 15:33:47 -08:00
quddusc
5938b9a00e am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs
* commit '5ad0e6289119dfaaa50a663e88dc0b978447302c':
  docs: Fixed deprecated constructor. Bug: 10581815
2013-12-26 15:33:43 -08:00
quddusc
39b799820d am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '52604aadaafc0921c2f81df715f01bec546021a2':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
2013-12-26 15:33:37 -08:00
Baligh Uddin
a95f6e3ac4 am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'bbeb313567064b30ad93cdadd49beb8141c3d47b':
  Import translations. DO NOT MERGE
2013-12-26 13:00:44 -08:00
Baligh Uddin
bbeb313567 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 20:58:31 +00:00
Baligh Uddin
7aa56efd73 am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7bb3e3b9ee22f2771c9fa71593c71910bbbcafac':
  Import translations. DO NOT MERGE
2013-12-26 11:11:15 -08:00
Baligh Uddin
5a736a99f8 Import translations. DO NOT MERGE
Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
Auto-generated-cl: translation import
2013-12-26 11:09:48 -08:00
Baligh Uddin
7bb3e3b9ee Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 19:09:19 +00:00
Baligh Uddin
64ec792948 Import translations. DO NOT MERGE
Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698
Auto-generated-cl: translation import
2013-12-26 11:07:34 -08:00
Baligh Uddin
dd6517c9df am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ea227306d68c7097b9cb079b1bfa6157c1ec2d30':
  Import translations. DO NOT MERGE
2013-12-26 10:43:19 -08:00
Baligh Uddin
ea227306d6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 18:41:56 +00:00
Baligh Uddin
8677794bfa Import translations. DO NOT MERGE
Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
Auto-generated-cl: translation import
2013-12-26 10:16:09 -08:00
Baligh Uddin
e965be7574 am d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit 'd6e863a19a631fd0003f96d507a21863fe973caa':
  Import translations. DO NOT MERGE
2013-12-26 09:59:57 -08:00
Baligh Uddin
d6e863a19a Import translations. DO NOT MERGE
Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be
Auto-generated-cl: translation import
2013-12-26 09:53:23 -08:00
quddusc
2a19129718 am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit 'cbc5f5410ff7c2b91e13f80a930f22944ce2ed88':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
2013-12-21 00:15:55 +00:00
quddusc
5d98ddf2f7 am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
* commit 'fca563a2d600c2e2a4ca0af2446a72e8bb36206e':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
2013-12-21 00:15:49 +00:00
quddusc
cbc5f5410f Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs 2013-12-21 00:13:56 +00:00
quddusc
fca563a2d6 docs: Fixed code snippet for unbinding from IAB v3 service.
Bug: 11858905

Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd
2013-12-20 15:21:38 -08:00
quddusc
be64abc025 docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive.
Bug: 11926096
Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
2013-12-20 15:14:42 -08:00
quddusc
e94bca2d84 am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs
* commit '70b96ec7303c1b34ff9d63a03359efadeec075c2':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
2013-12-20 23:10:33 +00:00
quddusc
34dbf7c323 am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs
* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
2013-12-20 23:10:28 +00:00
quddusc
70b96ec730 Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 2013-12-20 23:08:08 +00:00
quddusc
ad7b5993b5 Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 2013-12-20 23:07:35 +00:00
quddusc
8b03f63a0f docs: Added missing elements under "can contain:" list in manifest-element.html.
Bug: 5793521

Change-Id: I4340a8d043ebcf80634ad8cc1967b2a476a151d8
2013-12-20 15:02:24 -08:00
quddusc
5ad0e62891 am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs
* commit '12182bc236dd8e120a1f25d1a1862db744425558':
  docs: Fixed deprecated constructor. Bug: 10581815
2013-12-20 23:01:28 +00:00
quddusc
12182bc236 Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 2013-12-20 22:59:05 +00:00
quddusc
9072110b82 docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
2013-12-20 14:55:09 -08:00
quddusc
8f5434183e docs: Fixed deprecated constructor.
Bug: 10581815

Change-Id: I057acf1ad3037418c7247f865b6cb0847a9eb7b6
2013-12-20 14:07:45 -08:00
quddusc
52604aadaa am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '240aca333e340445f977d2a0e268a7c8d3a591e0':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
2013-12-20 20:37:30 +00:00
quddusc
240aca333e docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Change-Id: Icc640ffffc553c5e8825178453515cedcdc8a63f
2013-12-20 12:05:01 -08:00
David Friedman
51834f74e6 am c18061d5: am 7cd6cd31: NDK release notes for r9c for review
* commit 'c18061d5351fa4170b0b446fbea6300283789403':
  NDK release notes for r9c for review
2013-12-19 13:53:58 -08:00
David Friedman
c18061d535 am 7cd6cd31: NDK release notes for r9c for review
* commit '7cd6cd3178b8fb3b25a2c2ddeaff2733bfab9f43':
  NDK release notes for r9c for review
2013-12-19 21:51:22 +00:00