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

118375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Conley Owens
5b44325fff am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '849ab14d7237d3474f6dde3731ab65624ac297ac':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:48:58 +00:00
Conley Owens
849ab14d72 am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '7f16047b9efeba7cf82690b0492eaed44ca017df':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:46:00 +00: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
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
Raph Levien
971003c9ff am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'ece5bc9d692ec1579f45d9e28fdf52c1d966a21b':
  Re-initialize error after attach
 2014-01-06 17:12:18 +00:00
Todd Poynor
a807dbaeed am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
 2014-01-06 17:12:11 +00:00
Raph Levien
ece5bc9d69 am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '7b6b85d260fb4fe739e0af0cc0328e0678872899':
  Re-initialize error after attach
 2014-01-06 17:08:56 +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
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
Todd Poynor
91ecb36df5 ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
 2014-01-03 16:30:25 -08:00
Katie McCormick
02d5df1066 am d59c6151: am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit 'd59c615177ad827fd65dcdf4f595f40f84ca6cc5':
  Doc update: update console instructions per new UI.
 2014-01-03 21:21:53 +00:00
Katie McCormick
d59c615177 am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit '406fb742f461e3deda83984a47e66fc6bccacc78':
  Doc update: update console instructions per new UI.
 2014-01-03 21: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
136884b8e6 am cc265eaf: (-s ours) am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE 
* commit 'cc265eafed190a3586419cd43ddb4c62c9e874b5':
  Import translations. DO NOT MERGE
 2013-12-30 18:55:43 +00:00
Baligh Uddin
cc265eafed am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb23697a7e2ad4568d402e7efe006fc4ac650749':
  Import translations. DO NOT MERGE
 2013-12-30 18:52:29 +00: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
57d5cc8849 am 5cf8dc8e: (-s ours) am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5cf8dc8ea5b364802f9e986ddb7f4e21652145be':
  Import translations. DO NOT MERGE
 2013-12-26 23:50:28 +00:00
Baligh Uddin
bf29cbbc1d am 28e21fb4: (-s ours) am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed':
  Import translations. DO NOT MERGE
 2013-12-26 23:50:23 +00:00
Baligh Uddin
7aa47b5270 am c3e5b034: (-s ours) am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c3e5b034ca88360f98c1b60e48ab9640dbd271b9':
  Import translations. DO NOT MERGE
 2013-12-26 23:50:18 +00:00
Baligh Uddin
1bc72efdef am 6afb554c: (-s ours) am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit '6afb554cf07d2a4a2bffed34b696690d8ed0450a':
  Import translations. DO NOT MERGE
 2013-12-26 23:50:13 +00:00
quddusc
ae9702bb41 am ac4ebda9: am f16ddd6d: 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 'ac4ebda9f64f7ff54270f9448f597bac4dea71fc':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-26 23:50:08 +00:00
quddusc
9e39c9526d am 9dd65b93: am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit '9dd65b9397c97726bdd55ee7e91905f9ee34597c':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-26 23:50:02 +00:00
quddusc
aea9c66b4c am 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 
* commit '4e5a9b72afbd902227d8dcef6426d3a3be41daef':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
 2013-12-26 23:49:57 +00:00
quddusc
6208ef25fd am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'c609cb0d62b25b2526b8401e576df4dce5aa5a92':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:49:51 +00:00
quddusc
7c0da7ec5f am bb6316db: am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit 'bb6316db12418c3f010f8c730f6d4644920bbe8a':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-26 23:49:45 +00:00
quddusc
75b3c99ef5 am c2a3227a: am 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
* commit 'c2a3227a3d4bc055f311b50693b671c9667cfa67':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
 2013-12-26 23:49:39 +00:00
Baligh Uddin
5cf8dc8ea5 am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ca7a1442d0f633b663e59813957e98ef68c5f99e':
  Import translations. DO NOT MERGE
 2013-12-26 23:44:18 +00:00
Baligh Uddin
28e21fb425 am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4c60be5b135dd13556e947784f20f792c1f9d568':
  Import translations. DO NOT MERGE
 2013-12-26 23:44:08 +00:00
Baligh Uddin
c3e5b034ca am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ad141bd7e267c74daf33416412f9aab30e9751fa':
  Import translations. DO NOT MERGE
 2013-12-26 23:44:03 +00:00
Baligh Uddin
6afb554cf0 am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'b6d55917122b314c4ec547263e774934d67f2973':
  Import translations. DO NOT MERGE
 2013-12-26 23:43:59 +00:00