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

118246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
9d4ebdcafa am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys." 
* commit 'cf1aa551eed7be4310a386b9b9e458e46847207a':
  XmlUtils#readThisMapXml should handle null keys.
 2014-01-07 02:05:39 -08:00
Narayan Kamath
c9e27802f0 am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit '7e29625463e6034147c24992d0ad319ddf426088':
  Fix broken XML parsing idiom.
 2014-01-07 02:05:35 -08:00
Narayan Kamath
cf1aa551ee Merge "XmlUtils#readThisMapXml should handle null keys." 2014-01-07 10:03:21 +00:00
Narayan Kamath
7e29625463 Merge "Fix broken XML parsing idiom." 2014-01-07 10:02:57 +00:00
David Christie
6826387e50 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa
 2014-01-06 18:15:05 -08:00
David Christie
8e0c7768c8 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
 2014-01-06 17:57:30 -08:00
quddusc
fd08cd4852 am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit '0d4068ad1cbc8b8c550118c2214eb70116b83f81':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-06 16:30:35 -08:00
Baligh Uddin
be24e41b41 am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
  Import translations. DO NOT MERGE
 2014-01-06 16:30:30 -08:00
Baligh Uddin
f256f49f9f am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit '258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
  Import translations. DO NOT MERGE
 2014-01-06 16:30:25 -08:00
quddusc
0182bbea6d docs: Removed stray link. 
Bug: 11773486

Change-Id: I6d4f697cffd5a104fee87e9e1fb32cfa0611b1f0
 2014-01-06 16:14:31 -08:00
Conley Owens
7f16047b9e am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '73a6702eeaabdeb7b405ec504413d41716ef3508':
  CompoundButton: Let text can be changed by config
 2014-01-06 15:41:50 -08:00
Conley Owens
73a6702eea am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '4440a8244ea4fdd7c63083bcd7d4b179e851c17a':
  CompoundButton: Let text can be changed by config
 2014-01-06 15:38:05 -08:00
Conley Owens
4440a8244e Merge "CompoundButton: Let text can be changed by config" 2014-01-06 23:36:03 +00:00
quddusc
4268dbf6fe docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. 
Bug: 10797762

Change-Id: Iab554f547e482ba3493278ba471d2d47127e8fe0
 2014-01-06 15:31:09 -08:00
David Christie
766b5c4342 Clear cached locations when location providers disabled 
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c
 2014-01-06 15:30:34 -08:00
David Christie
75c55f92f5 Clear cached locations when location providers disabled 
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: I49eff73f89633052a2587112cdc381ae6d254bfe
 2014-01-06 15:23:39 -08:00
Dave Platt
76e5ca81b3 Fix descriptor leak after accepting connections 
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

Bug: 11805817

(cherry picked from commit 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)

Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1
 2014-01-06 14:31:28 -08:00
quddusc
c3e5498704 docs: Added missing links pointing to parent containers for <meta-data> manifest element. 
Bug: 11797515

Change-Id: Id6491615166c6c6dd164083cd7357de790bb67c7
 2014-01-06 14:30:59 -08:00
quddusc
9dbe4e4d5f docs: Fixed typo in IAB training doc. 
Bug: 10807741

Change-Id: Ibb1f784c3cc9f25c8d04da99718a9612d32146ac
 2014-01-06 14:07:49 -08:00
Dave Platt
02f042ddd9 Fix socket descriptor leak from Zygote to child app 
Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket.  The LocalSocket.close()
routine will no longer do so.

Bug: 12114500

(cherry picked from commit 70ef29b04ee4ef7d7acfec79041dbe800961195e)

Change-Id: Ief23a3c99e007dc4aa6f94dfb47a1b2b6c854dad
 2014-01-06 13:59:20 -08:00
quddusc
0d4068ad1c am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit 'ff65ca29a00aa282160dd8a77cdd6ed6855abba7':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-06 21:58:03 +00:00
quddusc
ff65ca29a0 Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 2014-01-06 21:55:28 +00:00
Baligh Uddin
2c4d6d91e2 am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fd8be467a38eded82d17740824cf87daa38e25e0':
  Import translations. DO NOT MERGE
 2014-01-06 13:47:50 -08:00
Baligh Uddin
258bd63f38 am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit '6e15a49eee1398aaf73f6b994b4148b198b67430':
  Import translations. DO NOT MERGE
 2014-01-06 13:47:46 -08:00
Baligh Uddin
fd8be467a3 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-01-06 21:45:16 +00:00
Baligh Uddin
b852d28cc1 Import translations. DO NOT MERGE 
Change-Id: Ic05c1c30830a0c9d7cb62fd53f6b144650e05609
Auto-generated-cl: translation import
 2014-01-06 13:15:51 -08:00
Baligh Uddin
6e15a49eee Import translations. DO NOT MERGE 
Change-Id: Iad53d8fd9f6b72114c8ab0444d60e8fed54f1df9
Auto-generated-cl: translation import
 2014-01-06 12:16:37 -08:00
quddusc
896e9744b0 docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. 
Bug: 9316251

Change-Id: I06779c3f6318058e475621d57898c2982757df38
 2014-01-06 19:53:49 +00:00
Raph Levien
7b6b85d260 am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
  Re-initialize error after attach
 2014-01-06 09:06:06 -08:00
Raph Levien
d7d0749805 am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df':
  Re-initialize error after attach
 2014-01-06 09:04:03 -08:00
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