summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-01-072-20/+20
|\ | | | | | | | | | | | | AmrInputStream" * commit '80cff94478a39914012df816179ea57c53040903': AArch64: Use long for pointers in AmrInputStream
| * am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"Narayan Kamath2014-01-072-20/+20
| |\ | | | | | | | | | | | | * commit '74675f29133ff36dccc95387392bf3654dc94e15': AArch64: Use long for pointers in AmrInputStream
| | * Merge "AArch64: Use long for pointers in AmrInputStream"Narayan Kamath2014-01-072-20/+20
| | |\
| | | * AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-072-20/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AmrInputStream class, as native pointers can be 64-bit. Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null ↵Narayan Kamath2014-01-072-12/+48
|\ \ \ | |/ / | | | | | | | | | | | | | | | keys." * commit '9d4ebdcafaa6a3f29978a7095f2bc3cbe0d5240a': XmlUtils#readThisMapXml should handle null keys.
| * | am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."Narayan Kamath2014-01-072-12/+48
| |\ \ | | |/ | | | | | | | | | * commit 'cf1aa551eed7be4310a386b9b9e458e46847207a': XmlUtils#readThisMapXml should handle null keys.
| | * Merge "XmlUtils#readThisMapXml should handle null keys."Narayan Kamath2014-01-072-12/+48
| | |\
| | | * XmlUtils#readThisMapXml should handle null keys.Narayan Kamath2014-01-062-12/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."Narayan Kamath2014-01-073-3/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c9e27802f049b9c3086770a7710b421ce33d2791': Fix broken XML parsing idiom.
| * | | am 7e296254: Merge "Fix broken XML parsing idiom."Narayan Kamath2014-01-073-3/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7e29625463e6034147c24992d0ad319ddf426088': Fix broken XML parsing idiom.
| | * | Merge "Fix broken XML parsing idiom."Narayan Kamath2014-01-073-3/+19
| | |\ \
| | | * | Fix broken XML parsing idiom.Narayan Kamath2014-01-063-3/+19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up ↵quddusc2014-01-062-20/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing ↵quddusc2014-01-062-20/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ Merge "docs: Updated instructions for setting up In-app Billing test ↵quddusc2014-01-062-20/+25
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | accounts to reflect new dev console UI. Bug: 7044477" into klp-docs
| | | * | | | docs: Updated instructions for setting up In-app Billing test accounts to ↵quddusc2014-01-022-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflect new dev console UI. Bug: 7044477 Change-Id: I722dc2e47c8dbe0cba48e44434d62fe28f23714f
* | | | | | | am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-01-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2': Import translations. DO NOT MERGE
| * | | | | | am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-01-060-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd8be467a38eded82d17740824cf87daa38e25e0': Import translations. DO NOT MERGE
| | * \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-01-062-3/+3
| | |\ \ \ \ \ \
| | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic05c1c30830a0c9d7cb62fd53f6b144650e05609 Auto-generated-cl: translation import
* | | | | | | | | am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-01-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '258bd63f38d90ac96aac5eb4e3a5c696e8b089f8': Import translations. DO NOT MERGE
| * | | | | | | | am 6e15a49e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-01-060-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e15a49eee1398aaf73f6b994b4148b198b67430': Import translations. DO NOT MERGE
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-062-4/+4
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad53d8fd9f6b72114c8ab0444d60e8fed54f1df9 Auto-generated-cl: translation import
* | | | | | | | am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by ↵Conley Owens2014-01-061-2/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config" * commit '73a6702eeaabdeb7b405ec504413d41716ef3508': CompoundButton: Let text can be changed by config
| * | | | | | | am 4440a824: Merge "CompoundButton: Let text can be changed by config"Conley Owens2014-01-061-2/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '4440a8244ea4fdd7c63083bcd7d4b179e851c17a': CompoundButton: Let text can be changed by config
| | * | | | | | Merge "CompoundButton: Let text can be changed by config"Conley Owens2014-01-061-2/+0
| | |\ \ \ \ \ \
| | | * | | | | | CompoundButton: Let text can be changed by configSeongJae Park2013-10-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because CompoundButton freezes text inside onSaveInstanceState, the text can't be changed automatically after locale of device changed. Bug from such a case reported via url below: https://code.google.com/p/android/issues/detail?id=24013 It would be better to don't freeze text for default case and let users to freeze text if they need manually. Change-Id: I2d6a192b6ff05a95b21487c2362cbc14691c68cf Signed-off-by: SeongJae Park <sj38.park@gmail.com>
* | | | | | | | | am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"Raph Levien2014-01-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd': Re-initialize error after attach
| * | | | | | | | am a980c7aa: Merge "Re-initialize error after attach"Raph Levien2014-01-061-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df': Re-initialize error after attach
| | * | | | | | | Merge "Re-initialize error after attach"Raph Levien2014-01-061-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Re-initialize error after attachDaniel 2 Olofsson2013-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If flag for error after attach is not reinitialized, it may cause NullPointerException on subsequent onAttachedWindow if error text was reset to null. Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
* | | | | | | | | am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per ↵Katie McCormick2014-01-032-16/+19
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new UI." into klp-docs * commit '65f5d74eada8937d68c821ff4f1c609e16613d22': Doc update: update console instructions per new UI.
| * | | | | | | | am 048895b5: Merge "Doc update: update console instructions per new UI." ↵Katie McCormick2014-01-032-16/+19
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit '048895b5a0532fef394a4a3f07af737f8d733335': Doc update: update console instructions per new UI.
| | * | | | | | | Merge "Doc update: update console instructions per new UI." into klp-docsKatie McCormick2014-01-032-16/+19
| | |\ \ \ \ \ \ \
| | | * | | | | | | Doc update: update console instructions per new UI.Katie McCormick2013-12-112-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b29e5c54914f0b2bff12d5025aae0d584821890
* | | | | | | | | | am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-300-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd58d91ef8296a75e07fa7b9b78dd6d9f5dd72015': Import translations. DO NOT MERGE
| * | | | | | | | | am 2ae0419f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-300-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca': Import translations. DO NOT MERGE
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34 Auto-generated-cl: translation import
* | | | | | | | | | am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-12-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'a95f6e3ac450a8df9ae90585f2c0c02726f9cb01': Import translations. DO NOT MERGE
| * | | | | | | | | am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbeb313567064b30ad93cdadd49beb8141c3d47b': Import translations. DO NOT MERGE
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-261-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827 Auto-generated-cl: translation import
* | | | | | | | | | | am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-12-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '7aa56efd7399b0628bde655c535fac6407eaade9': Import translations. DO NOT MERGE
| * | | | | | | | | | am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7bb3e3b9ee22f2771c9fa71593c71910bbbcafac': Import translations. DO NOT MERGE
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-261-2/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-261-2/+2
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698 Auto-generated-cl: translation import
* | | | | | | | | | | am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-12-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'dd6517c9dff66a2165e147201e813e1f305425c2': Import translations. DO NOT MERGE
| * | | | | | | | | | am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea227306d68c7097b9cb079b1bfa6157c1ec2d30': Import translations. DO NOT MERGE
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-264-13/+13
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-264-13/+13
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I010c6031e2bb9bfe71261008db8945116088a590 Auto-generated-cl: translation import
generated by cgit v1.1 at 2025-02-09 17:29:24 +0000