summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbreadDianne Hackborn2010-10-113-24/+14
|\
| * Fix SD card mounting issues #3074555 and #3072332Dianne Hackborn2010-10-113-24/+14
| | | | | | | | | | | | Change-Id: I79572bb4e92d2546abd97512a119ae74f0d72019 3074555: Kill "Shared storage safe to remove" notification 3072332: "blank shared storage" notification doesn't go anywhere
* | Merge "Change to new binder implementation for OBB" into gingerbreadKenny Root2010-10-111-1/+4
|\ \
| * | Change to new binder implementation for OBBKenny Root2010-10-111-1/+4
| | | | | | | | | | | | Change-Id: I3282df361a11fc37e94bc5ba4bd5860ae62a10e4
* | | Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-1113-430/+725
|\ \ \ | |/ /
| * | OBB: rearrange to be entirely asynchronousKenny Root2010-10-1113-430/+725
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrange structure of MountService handling of OBBs to be entirely asynchronous so we don't rely on locking as much. We still need the locking to support dumpsys which has been improved to output all the data structures for OBBs. Added more tests to cover more of the error return codes. Oh and fix a logic inversion bug. Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
* | | Merge "Add animation for the status bar going away." into gingerbreadJoe Onorato2010-10-111-1/+1
|\ \ \
| * | | Add animation for the status bar going away.Joe Onorato2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 3077525 Change-Id: I0c166fc161f8febe963e667259517173b9ac609b
* | | | Merge "Fix an event injection bug when the policy is bypassed." into gingerbreadJeff Brown2010-10-118-201/+149
|\ \ \ \
| * | | | Fix an event injection bug when the policy is bypassed.Jeff Brown2010-10-118-201/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the concept of a "trusted" event to distinguish between events from attached input devices or trusted injectors vs. other applications. This change enables us to move certain policy decisions out of the dispatcher and into the policy itself where they can be handled more systematically. Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
* | | | | Merge "Fix status bar flashing after orientation change" into gingerbreadJoe Onorato2010-10-111-21/+21
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix status bar flashing after orientation changeJoe Onorato2010-10-111-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hand merge 43a87c5c874f1b8fbf582ff522f10051a6434906 and add some more fixes Change-Id: Iea608bfba37e2e4c6a3430c13f683e54b0eff64b
* | | | | Merge "Grant URI permissions to the MCS" into gingerbreadKenny Root2010-10-111-10/+43
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Grant URI permissions to the MCSKenny Root2010-10-111-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the PackageManagerService is asked to install from a URI, it might be explicitly granted the permission to read from the URI content provider. We need to pass along these permissions to the MediaContainerService (DefaultContainerService) to ensure the MCS can read from the content provider. Change-Id: Ie7ddaeb638af82b60792a4c3f8c99e1e8eef1916
* | | | | Merge "Add a configuration option to turn on the screen when you unplug the ↵Joe Onorato2010-10-112-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | device." into gingerbread
| * | | | | Add a configuration option to turn on the screen when you unplug the device.Joe Onorato2010-10-112-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3068624 Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
* | | | | | am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.Scott Main2010-10-110-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread * commit '3fd40ee692ed1d4bca40e184119b0d1368671037': Revert "docs: new web apps dev guides" Do not merge.
| * | | | | | Revert "docs: new web apps dev guides" Do not merge.Scott Main2010-10-1111-1021/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 65e62f4f908394fc469cf535fef7c16035a428a2. Conflicts: docs/html/guide/guide_toc.cs Change-Id: If6eb679a629bd4376043b2f49b6a82eacf71603d
* | | | | | | Merge "Temporarily turn on backup/restore debug logs" into gingerbreadChris Tate2010-10-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Temporarily turn on backup/restore debug logsChris Tate2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several people are seeing odd behaviors around backup/restore at present. Enable expanded logging to help pin down exactly what is happening. Change-Id: I95ca013017cb07e633f2ba765583de3cf0e056af
* | | | | | | | Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbreadMathias Agopian2010-10-111-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fix a bug where FLIP_H would do a 180 rotationMathias Agopian2010-10-111-3/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2cc4a8543a5625750c8596f87edcb66fcbca31f
* | | | | | | | Merge "deliver invalidate messages AFTER other messages" into gingerbreadMathias Agopian2010-10-111-8/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | deliver invalidate messages AFTER other messagesMathias Agopian2010-10-111-8/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because invalidate messages were always handled first, they could prevent other messages to get through entirely. there is no real reason to handle invalidate messages first because the other messages are very uncommon and won't interfer with updates. Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
* | | | | | | Merge "Don't throw when userActivity fails because of the permission check." ↵Joe Onorato2010-10-111-1/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| * | | | | | | Don't throw when userActivity fails because of the permission check.Joe Onorato2010-10-111-1/+26
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just log. But don't log too often. Bug: 3083024 Change-Id: I66f942a67ed6c481afb4079045c66931a4c81688
* | | | | | | Go one day into 1970 for timezone code.Brad Fitzpatrick2010-10-111-2/+6
| |/ / / / / |/| | | | | | | | | | | | | | | | | Change-Id: I80251de79db6684ef3fa1ec835b400d9e3547401
* | | | | | Merge "On boot, advance time to at least 1970." into gingerbreadBrad Fitzpatrick2010-10-111-1/+16
|\ \ \ \ \ \
| * | | | | | On boot, advance time to at least 1970.Brad Fitzpatrick2010-10-111-1/+16
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise various Java APIs start doing their documented "correct" thing, which is to fail. Bug: 3081605 Change-Id: I90f8cde745d2ddab78419e37f60eea1e81a58127
* | | | | | Merge "fix a bug where timeouts would only be handled when a message was ↵Mathias Agopian2010-10-111-7/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | delivered" into gingerbread
| * | | | | | fix a bug where timeouts would only be handled when a message was deliveredMathias Agopian2010-10-111-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
* | | | | | | Merge "Just in case we're behind a NAT router/firewall, attempt to poke ↵Andreas Huber2010-10-111-0/+153
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
| * | | | | | | Just in case we're behind a NAT router/firewall, attempt to poke holes into ↵Andreas Huber2010-10-111-0/+153
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it for future incoming RTP/RTCP packets to pass through. Change-Id: Idd47968d4027f357222f19f15eecfd70fdec3282 related-to-bug: 3073813
* | | | | | | Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbreadMike Lockwood2010-10-112-0/+26
|\ \ \ \ \ \ \
| * | | | | | | GPS: Add update_network_state call to AGpsRillInterfaceMike Lockwood2010-10-112-0/+26
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I404a7a45773f592de7dfe75a8287fef15515ea8b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" ↵Brad Fitzpatrick2010-10-111-8/+25
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into gingerbread
| * | | | | | StrictMode: check max-offenses-per-loop earlier, before allocationsBrad Fitzpatrick2010-10-111-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously a tight loop of StrictMode violations would still allocate Exception objects and populate their stack frames, just to orphan them later when checking the max-10-violations-per-loop constraint. With this patch, we do that check _before_ allocating any memory. Change-Id: Iae96aba33f8fcc6a8ec5838a231aecc08e95122d
* | | | | | | Merge "Add mock ril control commands and tests" into gingerbreadXia Wang2010-10-112-9/+178
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add mock ril control commands and testsXia Wang2010-10-102-9/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add mock ril controller commands and test cases: - testStartIncomingCallAndHangup: test start incoming cal and hangup remote - testSetCallTransitionFlag: test call transition flag and call state transition Change-Id: I25ff8ef7931159ef7101b5e8638b9b7438db4f66
* | | | | | | SipHelper: add debug log for challenge responses.Hung-ying Tyan2010-10-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0143a0f076ef30b1b8998e477df933923bfa7b1
* | | | | | | New AppsPermission and market styleGilles Debunne2010-10-103-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3067333 Change-Id: Ibbf444cfd9b1e2d7b51f4194d57c6dee30ac18ee
* | | | | | | Don't manually create CallerInfo objects from SipPhoneDavid Brown2010-10-102-47/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the SipPhone class manually creates a CallerInfo object, and populates it with very basic info from the SIP address, when making an outgoing call. But this is no longer needed, now that we do caller-id lookup properly for SIP addresses (based on real data from the contacts database -- see bug 3004127 and change https://android-git.corp.google.com/g/70555). And in fact the presence of this initial CallerInfo object actually *disabled* contacts lookup for outgoing calls (bug 3072731). This change removes all that CallerInfo-related stuff from SipPhone. (Thus SipPhone is now consistent with the other phone objects, like GSMPhone and CDMAPhone, in that it doesn't muck with CallerInfo data at all, but instead lets the phone app do it.) Also, update isUriNumber() to handle "%40" in case the passed-in string is URI-escaped. (Nobody depends on that now, but it may be needed in the future, and it's certainly safe to say that "%40" will never be found in a legal PSTN number.) TESTED: - Outgoing SIP call: - In-call UI shows correct contact info - After the call, Call Log shows correct contact info - Incoming SIP call: - In-call UI shows correct contact info - After the call, Call Log shows correct contact info - PSTN calls: - correct contact info everywhere Bug: 3072731 Change-Id: I51434e4e5ad66d2e8ff51fc220001fb74485f0f5
* | | | | | | Merge "GPS: Fix another race condition in GPS HAL initialization" into ↵Mike Lockwood2010-10-101-28/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | GPS: Fix another race condition in GPS HAL initializationMike Lockwood2010-10-101-28/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3082940 Change-Id: I0953882cb768aec608f754c3bc9ab41418eded97 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "Updated media playback controls, unlock screen, misc framework ↵Justin Ho2010-10-1029-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | assets" into gingerbread
| * | | | | | | Updated media playback controls, unlock screen, misc framework assetsJustin Ho2010-10-1029-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7ee3d0ad81f2f27c33dcf698d5270b464d4430e
* | | | | | | | Merge "bug:3082865 don't use IN to construct sql to delete downloads" into ↵Vasu Nori2010-10-101-16/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | | bug:3082865 don't use IN to construct sql to delete downloadsVasu Nori2010-10-101-16/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DownloadManager should not use IN clause when constructing SQL to delete downloaded files Dowload app. Lexer code in Download app doesn't know how to parse it. Real fix is to fix Lexer. But seriously real fix is to get rid of this complexity - that I am planning for next version. also, the following 2 are identical, in terms of SQL performance WHERE _id IN (?, ?, ?) WHERE (_id = ? OR _id = ? OR _id = ?) Change-Id: Icca659a17c412247a193879e8d2f34e1b43ec9e5
* | | | | | | | Fallback to SharedPreferences$Editor.commit() when no apply() exists.Brad Fitzpatrick2010-10-103-9/+43
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gingerbread widened the SharedPreferences.Editor interface, adding an apply() method. Most people don't implement this interface themselves, but a couple apps do. A few spots in the core framework take a SharedPreferences[.Editor] from apps, which might be a pre-Gingerbread implementation without an apply() method. This patch makes sure we never depend on the presence of an apply() method, falling back to commit() if apply() isn't available. Change-Id: I32693ac9227a60b694526a26a30234fb17a40581
* | | | | | | Merge "Avoid pre-processing images when they won't be used" into gingerbreadXavier Ducrohet2010-10-101-1/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |