summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Kill the global references in the OpenGL wrappers.Elliott Hughes2011-04-1114-403/+214
| | | | | | | | | | | | | | | Just use jniThrowException instead. Note that it would be trivial to throw seemingly more appropriate exceptions (NullPointerException and OutOfMemoryException in particular), but I'm only attempting to preserve existing behavior here. I also found shadowing bugs in some of the special-case functions, which would previously always have leaked memory. This also moves an accidental change to a generated file (ActivityThread -> AppGlobals) into the generator, so it won't be overwritten in future. Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590
* Merge "Tidy up exception throwing in the media native code."Elliott Hughes2011-04-080-0/+0
|\
* \ Merge "Rework thumbnails in activity manager."Dianne Hackborn2011-04-080-0/+0
|\ \
* \ \ am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-080-0/+0
|\ \ \ | |_|/ |/| | | | | | | | * commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705': Stagefright: authenticate ANativeWindow.
| * | am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-080-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f': Stagefright: authenticate ANativeWindow.
| | * \ am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-080-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '66380f768c0de8bde1f54ac6ab3f126b66928dad': Stagefright: authenticate ANativeWindow.
* | | \ \ am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into ↵Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'da2790fa0adc187440c35261256c9989ca1b6ed8': Make ApnSettings threadsafe.
| * | | | am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '658779f5d81031dc2c34ef6bc374fad394d01465': Make ApnSettings threadsafe.
| | * | | Merge "Make ApnSettings threadsafe." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \
* | | \ \ \ Merge "Use the new API file format, and some minor tweaks to the old XML ↵Joe Onorato2011-04-080-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | files that make the parser easier."
* \ \ \ \ \ \ am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into ↵Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'ede9ed9f704979a373b6b8676373611409cff92f': Fix getActiveApnTypes for GsmDCT.
| * | | | | | am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59': Fix getActiveApnTypes for GsmDCT.
| | * | | | | Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
* | | | | | | am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." ↵Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | into honeycomb-LTE * commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e': Fix notification of disconnected networks.
| * | | | | am ac9c73ae: Merge "Fix notification of disconnected networks." into ↵Robert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8': Fix notification of disconnected networks.
| | * | | | Merge "Fix notification of disconnected networks." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | Merge "More JNI exception-throwing cleanup."Elliott Hughes2011-04-080-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge "Add keychain user with special keystore access permissions"Brian Carlstrom2011-04-081-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add keychain user with special keystore access permissionsBrian Carlstrom2011-04-081-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
* | | | | | | am 4a28096d: am 73ad388a: Merge "Check different CellLocation type in ↵Wink Saville2011-04-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GsmDataConnectionTracker" into honeycomb-LTE * commit '4a28096dec16666d9425cb8e23641985f963a4f3': Check different CellLocation type in GsmDataConnectionTracker
| * | | | | | am 73ad388a: Merge "Check different CellLocation type in ↵Wink Saville2011-04-080-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GsmDataConnectionTracker" into honeycomb-LTE * commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7': Check different CellLocation type in GsmDataConnectionTracker
| | * | | | | Merge "Check different CellLocation type in GsmDataConnectionTracker" into ↵Wink Saville2011-04-080-0/+0
| | | |/ / / | | |/| | | | | | | | | | | | | | | honeycomb-LTE
* | | | | | am 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '01f8f290cd2c01c7ed9a1966f39fa74032352dc8': Rename PhoneBase's DataConnectionTracker member.
| * | | | | am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.Robert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '63edf6c4f5795009e55f2ae9556550c38daa9774': Rename PhoneBase's DataConnectionTracker member.
* | | | | | Merge "resolved conflicts for merge of 4b1a37d7 to master"Wink Saville2011-04-080-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ resolved conflicts for merge of 4b1a37d7 to masterWink Saville2011-04-080-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | Change-Id: I872f40b0e0de534a37e3cf6bdc4d175b66226188
| | * | | | am 5203a5bc: Cleanup debugging.Wink Saville2011-04-080-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf': Cleanup debugging.
* | | | | | Merge "TextLayoutCache - add glyphs caching"Fabrice Di Meglio2011-04-080-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct ↵Wink Saville2011-04-080-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | value." into honeycomb-LTE * commit 'b93811091d8e412d1247ee1f4506b7db1439235d': DataConnection: set CID to the correct value.
| * | | | | am 1905e166: Merge "DataConnection: set CID to the correct value." into ↵Wink Saville2011-04-080-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '1905e166ed40ee11e80476848ef40e817512f740': DataConnection: set CID to the correct value.
| | * | | | Merge "DataConnection: set CID to the correct value." into honeycomb-LTEWink Saville2011-04-080-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "Tolerate missing AccountManager resource, not just missing resource name"Brian Carlstrom2011-04-080-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into ↵Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '2ce73e77c99effb9521db15c882529ccbafd57a6': Fix isApnTypeActive in GDCT.
| * | | | | | | am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '9c7f433c80fd2014562f8d161e6a34710fe475d6': Fix isApnTypeActive in GDCT.
| | * | | | | | Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge "Use jniThrowException for exception throwing from native code."Elliott Hughes2011-04-080-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ am e3e535a9: am 4410660e: Fix ISO country code of Slovenia.Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3e535a9c6b35971b54becc912e45da0f8b3f727': Fix ISO country code of Slovenia.
| * | | | | | | | am 4410660e: Fix ISO country code of Slovenia.Robert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '4410660e02c04b29d323c6d3bf81633fd07b6411': Fix ISO country code of Slovenia.
* | | | | | | | | Merge "Don't send pause again when coming back from full screen"Teng-Hui Zhu2011-04-080-0/+0
|\ \ \ \ \ \ \ \ \
* | | | | | | | | | Merge "Add camera focus area API."Wu-cheng Li2011-04-080-0/+0
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge "Improve activity manager debug dumps."Dianne Hackborn2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- ↵Nicolas Roard2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java counterpart of the fix for bug:4183801" into honeycomb-mr1 * commit '16d8de7a293e5d626823a59f2d8b74e0d4a75cbd': Remove uncalled function -- java counterpart of the fix for bug:4183801
| * | | | | | | | am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java ↵Nicolas Roard2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counterpart of the fix for bug:4183801" into honeycomb-mr1 * commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6': Remove uncalled function -- java counterpart of the fix for bug:4183801
| | * | | | | | | am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix ↵Nicolas Roard2011-04-070-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for bug:4183801" into honeycomb-mr1 * commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a': Remove uncalled function -- java counterpart of the fix for bug:4183801
| | | * | | | | | Merge "Remove uncalled function -- java counterpart of the fix for ↵Nicolas Roard2011-04-070-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4183801" into honeycomb-mr1
* | | | \ \ \ \ \ \ Merge "Fix crash in bug 4259574"Adam Cohen2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Add params for primary account to ContactsContract"Daisuke Miyakawa2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | am 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio ↵Wink Saville2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | technology + 2 to setupDataCall." into honeycomb-LTE * commit '5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b': Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
| * | | | | | | | | | am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + ↵Wink Saville2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2 to setupDataCall." into honeycomb-LTE * commit '7183a7a584397142ab7347d6f721011d743fb699': Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
| | * | | | | | | | | Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to ↵Wink Saville2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | setupDataCall." into honeycomb-LTE
generated by cgit v1.1 at 2024-12-27 01:43:47 +0000