summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move LOG_ALWAYS_FATAL to end of app_processBrian Carlstrom2010-10-071-1/+1
| | | | | | | Since LOG_ALWAYS_FATAL is always fatal and code after it is by definition unreachable, put the call after other diagnostic output. Change-Id: Ib3a515a04125d8e4f6e8af3a6f59226e8f0dd9cd
* Merge "Make a separate active sync queue for initialization and regular syncs."Fred Quintana2010-10-065-726/+636
|\
| * Make a separate active sync queue for initialization and regular syncs.Fred Quintana2010-10-055-726/+636
| | | | | | | | | | | | | | This entails allowing multiple syncs to happen in parallel, with different limits for regular and initialization syncs. Change-Id: I0e47c6515af5c98faf899f91855b342b0d0c708c
* | Merge "Adjust start time and duration for overlays and effects."Gil Dobjanschi2010-10-065-88/+111
|\ \
| * | Adjust start time and duration for overlays and effects.Gil Dobjanschi2010-10-055-88/+111
| | | | | | | | | | | | Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
* | | Merge "Make sure that we send the DeviceOrientation error event only once"Steve Block2010-10-061-0/+8
|\ \ \
| * | | Make sure that we send the DeviceOrientation error event only onceSteve Block2010-10-061-0/+8
| | | | | | | | | | | | | | | | Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
* | | | Fix instance count to be longBrian Carlstrom2010-10-051-1/+1
| | | | | | | | | | | | | | | | Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
* | | | Adding android.os.Debug.countInstancesOfClassBrian Carlstrom2010-10-053-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Debug.countInstancesOfClass is just a wrapper on dalvik.system.VMDebug.countInstancesOfClass to avoid code from depending on the dalvik classes directly - Existing usages of VMDebug.countInstancesOfClass in ActivityThread and ViewDebug are converted to the new Debug.countInstancesOfClass - Existing use of OpenSSLSocketImpl.instanceCount, which is being removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class) Bug: 3015791 Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
* | | | Merge "Turn on some debugging info"Robert Greenwalt2010-10-052-2/+2
|\ \ \ \
| * | | | Turn on some debugging infoRobert Greenwalt2010-10-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug:3060742 Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
* | | | | Merge "Use setVideoSize API in StagefrightRecorder"James Dong2010-10-052-2/+72
|\ \ \ \ \
| * | | | | Use setVideoSize API in StagefrightRecorderJames Dong2010-10-042-2/+72
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7ddf5e8d2b931453d2cb801169906191349ca07
* | | | | | Merge "Optimize saveLayer() when the clip flag is set."Romain Guy2010-10-0510-64/+220
|\ \ \ \ \ \
| * | | | | | Optimize saveLayer() when the clip flag is set.Romain Guy2010-10-0510-64/+220
| | | | | | | | | | | | | | | | | | | | | This speeds up applications, especially Launcher.
* | | | | | | Merge "Implement permission granting in clipboard."Dianne Hackborn2010-10-057-26/+256
|\ \ \ \ \ \ \
| * | | | | | | Implement permission granting in clipboard.Dianne Hackborn2010-10-057-26/+256
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
* | | | | | | Merge "fix broken build"Vasu Nori2010-10-051-0/+1
|\ \ \ \ \ \ \
| * | | | | | | fix broken buildVasu Nori2010-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic00e8b98780d48928e05ee27f855e8211fb1ec47
* | | | | | | | Merge "annotate some tests large - just in case they take longer. bug:3066136"Vasu Nori2010-10-052-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | annotate some tests large - just in case they take longer. bug:3066136Vasu Nori2010-10-052-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89ab0454f592748f971b678a3ae23724eb6fc2e5
* | | | | | | | am bfa33b94: am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into ↵Kenny Root2010-10-052-8/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b' * commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b': Use pread() in ZipFileRO for Linux
| * \ \ \ \ \ \ \ am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbreadKenny Root2010-10-042-8/+49
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp * commit 'f84a5918f5e0572c0280fa705970ef7459b45393': Use pread() in ZipFileRO for Linux
| | * \ \ \ \ \ \ \ Merge "Use pread() in ZipFileRO for Linux" into gingerbreadKenny Root2010-10-042-8/+49
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use pread() in ZipFileRO for LinuxKenny Root2010-10-042-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AssetManager instances are created by zygote and passed to all its children so that they don't have to individually open frameworks-res.apk. This creates a problem for determining the current file offset when using lseek() on those files, because you can't guarantee the cross-process locking of a mutex. Luckily, Linux implements pread() to get around this suckiness. The problem is that only Linux implements this, so we have to keep the old locking for use on host builds with aapt and friends. aapt doesn't have this same problem of sharing file descriptors across forked processes, so we can keep the local AutoMutex to protect accesses of those files. Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
* | | | | | | | | | | am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset.Gilles Debunne2010-10-052-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800' * commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800': Restored ic_dialog_menu_generic asset.
| * | | | | | | | | | am c37eac24: Restored ic_dialog_menu_generic asset.Gilles Debunne2010-10-042-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp * commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5': Restored ic_dialog_menu_generic asset.
| | * | | | | | | | | Restored ic_dialog_menu_generic asset.Gilles Debunne2010-10-042-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17904a5376b841de72b95b59d0c277c53549f6c7
* | | | | | | | | | | Merge "turn off some useless messages"Vasu Nori2010-10-051-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | turn off some useless messagesVasu Nori2010-10-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ed5696cd052b70e7cf7b872205470cd56fada90
* | | | | | | | | | am 8556efe5: (-s ours) am a29643a6: Merge "DO NOT MERGE. Select word no ↵Gilles Debunne2010-10-050-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer selects spaces between words." into gingerbread Merge commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920' * commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920': DO NOT MERGE. Select word no longer selects spaces between words.
| * | | | | | | | | am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces ↵Gilles Debunne2010-10-041-44/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between words." into gingerbread Merge commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp * commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee': DO NOT MERGE. Select word no longer selects spaces between words.
| | * | | | | | | | Merge "DO NOT MERGE. Select word no longer selects spaces between words." ↵Gilles Debunne2010-10-041-44/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | | | | DO NOT MERGE. Select word no longer selects spaces between words.Gilles Debunne2010-10-041-44/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3000870 This feature was useful to paste between two words. To do this, all you have to do now in to first position the cursor between the words, and then long pressing anywhere to get the pop-up menu with paste. Not merged into HC since the paste story in HC still has to be determined. Change-Id: Iea8d87e09b7ad43658ec5526110e609b9735c27a
* | | | | | | | | | | am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more ↵Scott Main2010-10-052-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | countries for market announcement Merge commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f' * commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f': docs: update homepage with more countries for market announcement
| * | | | | | | | | | am c692792e: am 46ffeb21: docs: update homepage with more countries for ↵Scott Main2010-10-042-5/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | market announcement Merge commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88' into gingerbread-plus-aosp * commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88': docs: update homepage with more countries for market announcement
| | * | | | | | | | | am 46ffeb21: docs: update homepage with more countries for market announcementScott Main2010-10-042-5/+7
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread * commit '46ffeb218859a543540a70b3229a48d2d96cbb4a': docs: update homepage with more countries for market announcement
| | | * | | | | | | | docs: update homepage with more countries for market announcementScott Main2010-10-042-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb56ddd57ca23b2773792f171bc65327b2f725bd
* | | | | | | | | | | Merge "Adding average fps counter. Removing rsLight from libRS"Alex Sakhartchouk2010-10-0511-231/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adding average fps counter.Alex Sakhartchouk2010-10-0511-231/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing rsLight from libRS Change-Id: I8622efd10619dc120d37f3a12122e9c7fc34ff2e
* | | | | | | | | | | | Merge "Adding next/prev to fragment animations and to PreferenceActivity"Chet Haase2010-10-0515-93/+274
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Adding next/prev to fragment animations and to PreferenceActivityChet Haase2010-10-0515-93/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would either be placed onto or taken off of the stack, or would just replace the current fragment. The new next/prev capability gives the ability to run a transition that is specific to next/previous operations, such as navigating forward and backward in a list. New next/prev animations may be associated with a fragment replace operation to get the next/prev animations built into the system (next animates things up, prev animates them down). Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
* | | | | | | | | | | | | Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new ↵Scott Main2010-10-057-0/+1330
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced."
| * | | | | | | | | | | | | docs: Rewrite of App Fundamentals.. Part 1.Scott Main2010-10-057-0/+1330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced. Change-Id: I46425b5c2c3b928dc81bafd05a88ad3ea1c5be53
* | | | | | | | | | | | | | am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by ↵Scott Main2010-10-051-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ibd81091fc6002a77ce43f553b63facec53f16a38 Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d' * commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d': docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
| * | | | | | | | | | | | | am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by ↵Scott Main2010-10-041-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ibd81091fc6002a77ce43f553b63facec53f16a38 Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp * commit 'b3a5b85a612703e54e631ffab5bb518eba909899': docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
| | * | | | | | | | | | | | am 6ef33cb3: docs: fix error in merge caused by ↵Scott Main2010-10-041-13/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ibd81091fc6002a77ce43f553b63facec53f16a38 Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread * commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d': docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
| | | * | | | | | | | | | | docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38Scott Main2010-10-041-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic46ba89cfd0566fea792f65dfa130bef7010b164
* | | | | | | | | | | | | | am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into ↵James Dong2010-10-051-24/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db' * commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db': Resilent media time stamp adjustment
| * | | | | | | | | | | | | am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbreadJames Dong2010-10-041-24/+181
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp * commit 'b99f0c7eae365f788a21944fef28de580c7f5f92': Resilent media time stamp adjustment
generated by cgit v1.1 at 2024-06-29 04:58:46 +0000