summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc Change:ActivityManager usage doc:running test packageJoe Malin2010-08-301-1/+6
| | | | Change-Id: I9a0c28e59f87e30c81d18162bee082b851d07a94
* Make profiling easier.Romain Guy2010-08-301-5/+5
| | | | Change-Id: I3d4a0a0ead72569a8950bc986dfe584b186e0d65
* Merge "Fix NPE when Spinner is reused."Daisuke Miyakawa2010-08-301-4/+3
|\
| * Fix NPE when Spinner is reused.Daisuke Miyakawa2010-08-301-4/+3
| | | | | | | | | | Bug: 2958228 Change-Id: I2c5e322b92fd4896361d02a307d0ba0ef3d33029
* | Add an Intent category for apps that provide an app market.Patrick Dubroy2010-08-302-0/+17
| |
* | Merge "Fixing renderscript uniform binding bugs. Working on custom shaders."Alex Sakhartchouk2010-08-3010-43/+362
|\ \
| * | Fixing renderscript uniform binding bugs.Alex Sakhartchouk2010-08-2710-43/+362
| | | | | | | | | | | | | | | | | | Working on custom shaders. Change-Id: I0d51e879e1c2b46ef5ab696b35162898f4196fc8
* | | MTP: Move all MTP protocol constants for Java to a central location.Mike Lockwood2010-08-305-190/+457
| | | | | | | | | | | | | | | Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | MTP: Fix build break due to misuse of "git add -i" commandMike Lockwood2010-08-301-1/+0
| | | | | | | | | | | | | | | Change-Id: I85528a43a56942dde921603a353383e2c8f8d93d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "MTP: Add try/finally handling to finalize overrides"Mike Lockwood2010-08-304-7/+24
|\ \ \ | |_|/ |/| |
| * | MTP: Add try/finally handling to finalize overridesMike Lockwood2010-08-304-7/+24
| | | | | | | | | | | | | | | Change-Id: I23c481d6214ed5f045f903845632c07c11bb42a3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the ↵Derek Sollenberger2010-08-301-9/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system image." into gingerbread Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4' * commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4': Support pre-loading browser plugins on the system image.
| * \ \ am 6726d6bb: Merge "Support pre-loading browser plugins on the system ↵Derek Sollenberger2010-08-301-9/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image." into gingerbread Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp * commit '6726d6bb1a30167786864c445cbe0370ee0dd58c': Support pre-loading browser plugins on the system image.
| | * \ \ Merge "Support pre-loading browser plugins on the system image." into ↵Derek Sollenberger2010-08-301-9/+19
| | |\ \ \ | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | Support pre-loading browser plugins on the system image.Derek Sollenberger2010-08-271-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shared library from a pre-loaded plugin is in the /system/lib directory and not in the apps typical data directory. This change adjust the plugin loading to handle that difference and ensures that the right library is loaded. Change-Id: I4337089e40944e77adb6a95afb93cc1d5069511a http://b/2779728
* | | | | | Merge "Testing Documentation in the Dev Guide tab"Joe Malin2010-08-2812-1068/+2179
|\ \ \ \ \ \
| * | | | | | Testing Documentation in the Dev Guide tabJoe Malin2010-08-2712-1068/+2179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
* | | | | | | Revert "Fix build."Omari Stephens2010-08-271-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888. Ironically, this change (to fix the build in gingerbread) ended up breaking the (previously-green) build in master. It probably should have been marked to not merge. Either way, this fixes the master build
* | | | | | | am 02b19843: am 27cf4ad8: Fix build.Daniel Sandler2010-08-271-23/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '02b19843d4fb28103cc4b21aa2017eeca795d87d' * commit '02b19843d4fb28103cc4b21aa2017eeca795d87d': Fix build.
| * | | | | | am 27cf4ad8: Fix build.Daniel Sandler2010-08-271-23/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888' into gingerbread-plus-aosp * commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888': Fix build.
| | * | | | | Fix build.Daniel Sandler2010-08-271-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I848bf50dc7c928e53a3637c4cec51ebcaef4f47f
* | | | | | | am 554d8726: (-s ours) am 0776deff: More obsolete status bar bits. DO NOT MERGEDaniel Sandler2010-08-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '554d8726f8df053c07e0c68e43f060019c11264e' * commit '554d8726f8df053c07e0c68e43f060019c11264e': More obsolete status bar bits. DO NOT MERGE
| * | | | | | am 0776deff: More obsolete status bar bits. DO NOT MERGEDaniel Sandler2010-08-275-7/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5' into gingerbread-plus-aosp * commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5': More obsolete status bar bits. DO NOT MERGE
| | * | | | | More obsolete status bar bits. DO NOT MERGEDaniel Sandler2010-08-275-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2949215 Change-Id: Ibf39d37df63ce4bbd0e0da5325495feec9d69a67
* | | | | | | am 44af754c: (-s ours) am d02bdaab: Remove experimental immersive mode ↵Daniel Sandler2010-08-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support. DO NOT MERGE Merge commit '44af754cf0c9ad9a8162e1bd2af60737e81a8beb' * commit '44af754cf0c9ad9a8162e1bd2af60737e81a8beb': Remove experimental immersive mode support. DO NOT MERGE
| * | | | | | am d02bdaab: Remove experimental immersive mode support. DO NOT MERGEDaniel Sandler2010-08-2712-359/+12
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp * commit 'd02bdaab495641ab50e2123fdfd99a819cc40540': Remove experimental immersive mode support. DO NOT MERGE
| | * | | | | Remove experimental immersive mode support. DO NOT MERGEDaniel Sandler2010-08-2712-359/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2949215 Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
* | | | | | | Fix float precision thingie in current.xmlOmari Stephens2010-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54e0290118eb34b098ef43ff1351194c2d8051dc
* | | | | | | Merge "client_id->clientId, bugfix for signaling of read abort on stop."Nipun Kwatra2010-08-272-52/+57
|\ \ \ \ \ \ \
| * | | | | | | client_id->clientId, bugfix for signaling of read abort on stop.Nipun Kwatra2010-08-272-52/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - changed client_id->clientId, mClient_id->mClientId - there was a bug in the condition for calling signalReadComplete_lock() in stop. We should call it only when !mLastReadCompleted and also if the current client has not already completed its read (this second check was missing before). Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
* | | | | | | | am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC ↵Kenny Root2010-08-2710-398/+613
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers" into gingerbread Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74' * commit '8328578152fbfd23952a6cda4b2e60853d78eb74': Allow native shared libraries in ASEC containers
| * | | | | | | am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into ↵Kenny Root2010-08-2710-398/+613
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp * commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3': Allow native shared libraries in ASEC containers
| | * | | | | | Merge "Allow native shared libraries in ASEC containers" into gingerbreadKenny Root2010-08-2710-398/+613
| | |\ \ \ \ \ \
| | | * | | | | | Allow native shared libraries in ASEC containersKenny Root2010-08-2710-398/+613
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the native library handling earlier in the package installation process so that it may be inserted into ASEC containers before they are finalized in the DefaultContainerService. Note that native libraries on SD card requires that vold mount ASEC containers without the "noexec" flag on the mount point. Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
* | | | | | | | | am 63b5b870: am 15665bb6: Add current.xml API file missing from I8f2b6b79.Brad Fitzpatrick2010-08-271-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '63b5b8701092de71e48b36cce8eb36f51f9d4d5e' * commit '63b5b8701092de71e48b36cce8eb36f51f9d4d5e': Add current.xml API file missing from I8f2b6b79.
| * | | | | | | | am 15665bb6: Add current.xml API file missing from I8f2b6b79.Brad Fitzpatrick2010-08-271-0/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53' into gingerbread-plus-aosp * commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53': Add current.xml API file missing from I8f2b6b79.
| | * | | | | | | Add current.xml API file missing from I8f2b6b79.Brad Fitzpatrick2010-08-271-0/+11
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes build. Change-Id: I7d845fb45b5221425f41cf3069fea7f31ea6b225
* | | | | | | | am 8da20dd0: am 4f8c2f26: Fix docs build.Dianne Hackborn2010-08-272-3/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8da20dd03797dcdc1f417fe9cebc21825551dd69' * commit '8da20dd03797dcdc1f417fe9cebc21825551dd69': Fix docs build.
| * | | | | | | am 4f8c2f26: Fix docs build.Dianne Hackborn2010-08-272-3/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp * commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699': Fix docs build.
| | * | | | | | Fix docs build.Dianne Hackborn2010-08-272-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49591c46080361acf5b528116726c27b6ed9da9a
* | | | | | | | am d71021cb: am 0c731f99: Merge "Send broadcast intent when configured ↵Brad Fitzpatrick2010-08-272-2/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location providers change." into gingerbread Merge commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3' * commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3': Send broadcast intent when configured location providers change.
| * | | | | | | am 0c731f99: Merge "Send broadcast intent when configured location providers ↵Brad Fitzpatrick2010-08-272-2/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change." into gingerbread Merge commit '0c731f99b05630e16dce572ac206ab75c90891cd' into gingerbread-plus-aosp * commit '0c731f99b05630e16dce572ac206ab75c90891cd': Send broadcast intent when configured location providers change.
| | * | | | | | Merge "Send broadcast intent when configured location providers change." ↵Brad Fitzpatrick2010-08-272-2/+13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | | Send broadcast intent when configured location providers change.Brad Fitzpatrick2010-08-272-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See e.g. http://code.google.com/p/android/issues/detail?id=10042 This is also needed by the power control widget, which has no reliable way otherwise of staying in-sync. Change-Id: I8f2b6b79b1843329bae952a25ea56f15e3cf92aa
* | | | | | | | | am af610b2b: am 1620d118: Fix SDK build error.Wu-cheng Li2010-08-271-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048' * commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048': Fix SDK build error.
| * | | | | | | | am 1620d118: Fix SDK build error.Wu-cheng Li2010-08-271-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12' into gingerbread-plus-aosp * commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12': Fix SDK build error.
| | * | | | | | | Fix SDK build error.Wu-cheng Li2010-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4705c10da850d684caa7067d656aff11bc65acbb
* | | | | | | | | am a5fe77d0: am df8356ff: Merge "Workaround for a QCOM issue where the ↵James Dong2010-08-272-0/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc' * commit 'a5fe77d004091bd9521d087c2572f587191afbfc': Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
| * | | | | | | | am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size ↵James Dong2010-08-272-0/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | advertised by the AVC encoder is occasionally too small." into gingerbread Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp * commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad': Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
| | * | | | | | | Merge "Workaround for a QCOM issue where the output buffer size advertised ↵James Dong2010-08-272-0/+14
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by the AVC encoder is occasionally too small." into gingerbread
generated by cgit v1.1 at 2024-07-31 02:13:12 +0000