summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.Wu-cheng Li2010-09-214-20/+25
|\ | | | | | | | | | | | | Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp * commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2': Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
| * Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.Wu-cheng Li2010-09-214-20/+25
| | | | | | | | | | | | | | | | | | | | This constant is not public yet. Continuous autofocus should behave differently in still camera and camcorder. In camcorder, lens movement may be more smooth. And the triggers to start a new focus search may be different. If there is a need, FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future. Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
* | am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB ↵Mike Lockwood2010-09-211-8/+9
|\ \ | |/ | | | | | | | | | | | | | | disconnect." into gingerbread Merge commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9' into gingerbread-plus-aosp * commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9': SystemUI: Use new USB notifications to detect USB disconnect.
| * Merge "SystemUI: Use new USB notifications to detect USB disconnect." into ↵Mike Lockwood2010-09-211-8/+9
| |\ | | | | | | | | | gingerbread
| | * SystemUI: Use new USB notifications to detect USB disconnect.Mike Lockwood2010-09-211-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that prevented the USB mass storage activity from closing when USB is disconnected. The bug was actually due to using == for a string compare instead of equals(), but using the new notifications is a better solution than using battery events since it will work for devices that do not charge over USB. BUG: 3018954 Change-Id: Ia447974726a52cd865e59df5af79e828b5134b6c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 6548f395: Merge "Inet status bug fix" into gingerbreadRobert Greenwalt2010-09-212-13/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp * commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef': Inet status bug fix
| * | Merge "Inet status bug fix" into gingerbreadRobert Greenwalt2010-09-212-13/+25
| |\ \
| | * | Inet status bug fixRobert Greenwalt2010-09-212-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't wipe out the connected status every time we get a cellular status change. Don't filter out disconnect event for wifi - we need them. bug:3009923 Change-Id: I68cadac5f44d6eb4e0fe711fda7c5d218abb45bd
* | | | am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue ↵Dianne Hackborn2010-09-211-17/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | showing up erratically" into gingerbread Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp * commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9': Fix issue #2999757: "Application Redirected" dialogue showing up erratically
| * | | Merge "Fix issue #2999757: "Application Redirected" dialogue showing up ↵Dianne Hackborn2010-09-211-17/+21
| |\ \ \ | | | | | | | | | | | | | | | erratically" into gingerbread
| | * | | Fix issue #2999757: "Application Redirected" dialogue showing up erraticallyDianne Hackborn2010-09-201-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give up on this for now. Change-Id: Ic66a36d468f8bcb313d9bde2809124cdfd74adb3
* | | | | am 4c571a62: Fix the build.Chung-yih Wang2010-09-201-21/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp * commit '4c571a62b1a4fb71585179bce84246b55097b47e': Fix the build.
| * | | | Fix the build.Chung-yih Wang2010-09-211-21/+0
| |/ / / | | | | | | | | | | | | Change-Id: I6e3f683be22ab834ca1b83a1dbb0b3acd62645d2
* | | | am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into ↵Dianne Hackborn2010-09-201-39/+97
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp * commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d': Fix #2999258: ANR in Settings after every reboot
| * | | Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbreadDianne Hackborn2010-09-201-39/+97
| |\ \ \
| | * | | Fix #2999258: ANR in Settings after every rebootDianne Hackborn2010-09-201-39/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main problem here was in the error recovery when we are waiting for a process to start but it has failed for some reason. The code was just setting mPendingBroadcast to null, but this would cause an eventual ANR because the state was not set back to IDLE so we would continue waiting for the broadcast without trying to restart its process. Now we set it to idle. We also need to reset the "nextReceiver" index, so there is a new mPendingBroadcastRecvIndex variable holding what it should be set back to. While digging into this, I found a number of other lesser problems: - There is a race when booting the system where we set mSystemReady to true before restarting the upgrade processes. This could allow a broadcast to happen between those two and its process to immediately be removed. To fix this, there is a new mProcessesReady that is set once we are truly ready to start launching processes. - There were various places where we were calling sendBroadcastLocked() without the flag to send only to receivers... if this is called before mProcessesReady is set, then we would end up sticking any process for the broadcast on the holding list to not get launched until later (and hang up all broadcasts as they want for it). Now we always make sure to set this appropriately. - sendBroadcastInPackage() was not doing all of the validation that sendBroadcast() does. And of course a bunch of new debugging logs that were done in the course of tracking this down. Change-Id: I6134bbd94fdb73db8b693507b29499eae012d543
* | | | | am 708e4251: Merge "Revert the ANSWERING state." into gingerbreadChung-yih Wang2010-09-204-30/+35
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp * commit '708e42512a8b14202cd872d96d1f071ccb4cf915': Revert the ANSWERING state.
| * | | | Merge "Revert the ANSWERING state." into gingerbreadChung-yih Wang2010-09-204-30/+35
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Revert the ANSWERING state.Chung-yih Wang2010-09-214-30/+35
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | +fix the unknown call flash for answering an incoming call and updating the screen if the background call got dropped. +change the getFirstActiveBgCall to return the call if the state is not IDLE. This will help to fix unknown flash if the background call got dropped. Change-Id: I9803ccebd919acbd5296e7dfde7dc5f29cc9f180
* | | | am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbreadRobert Greenwalt2010-09-201-0/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp * commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a': Add Inet Condition log to bugreports
| * | | Merge "Add Inet Condition log to bugreports" into gingerbreadRobert Greenwalt2010-09-201-0/+27
| |\ \ \ | | |/ / | |/| |
| | * | Add Inet Condition log to bugreportsRobert Greenwalt2010-09-201-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Reports who reports what condition on which network at what time. Where is implied. Change-Id: I89fbc7323dec438041859fcc934169fa325f0133
* | | | am df59f257: Merge "DO NOT MERGE Enable debug in StatusBarService" into ↵Irfan Sheriff2010-09-201-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'df59f257583730470085db65c7faf44960c3b32e' into gingerbread-plus-aosp * commit 'df59f257583730470085db65c7faf44960c3b32e': DO NOT MERGE Enable debug in StatusBarService
| * | | Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbreadIrfan Sheriff2010-09-201-2/+1
| |\ \ \ | | |_|/ | |/| |
| | * | DO NOT MERGE Enable debug in StatusBarServiceIrfan Sheriff2010-09-201-2/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | This is a temporary enable to allow us to identify the issue with multiple icons on StatusBar Bug: 2984213 Change-Id: I36ac7baff6544c63fa44d9b2c7453bca6a33bd62
* | | am 307aef01: Merge "LocationManager: Hide location provider and geocode ↵Mike Lockwood2010-09-207-467/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | provider APIs." into gingerbread Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp * commit '307aef01257cbba42f095f7020a4a3b753f3807b': LocationManager: Hide location provider and geocode provider APIs.
| * | Merge "LocationManager: Hide location provider and geocode provider APIs." ↵Mike Lockwood2010-09-207-467/+14
| |\ \ | | | | | | | | | | | | into gingerbread
| | * | LocationManager: Hide location provider and geocode provider APIs.Mike Lockwood2010-09-207-467/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename Geocoder.isImplemented() to Geocoder.isPresent() BUG: 3000738 BUG: 3001413 Change-Id: I56bb4e9a9c59f8b79de585eeb168f74c3ff1a853 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake ↵Dianne Hackborn2010-09-201-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock use." into gingerbread Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp * commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15': DO NOT MERGE. Wifi service now blames apps for its wake lock use.
| * | | Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." ↵Dianne Hackborn2010-09-201-1/+2
| |\ \ \ | | |/ / | |/| | | | | | into gingerbread
| | * | DO NOT MERGE. Wifi service now blames apps for its wake lock use.Dianne Hackborn2010-09-201-1/+2
| | | | | | | | | | | | | | | | Change-Id: Ic57d8f77527bbfea6a129b8f348fe9108157b4d8
* | | | am 4db643eb: Merge "In theory the package manager now scans /vendor/app" ↵Dianne Hackborn2010-09-201-2/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp * commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3': In theory the package manager now scans /vendor/app
| * | | Merge "In theory the package manager now scans /vendor/app" into gingerbreadDianne Hackborn2010-09-201-2/+18
| |\ \ \
| | * | | In theory the package manager now scans /vendor/appDianne Hackborn2010-09-201-2/+18
| | | |/ | | |/| | | | | | | | | | | | | | | | | Not tested. Change-Id: Ib6120d645074c95dd0afd1476f6167aec5d50bb9
* | | | am a4270e7e: am 73e150c8: provide link to backup guide above the foldScott Main2010-09-201-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp * commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa': provide link to backup guide above the fold
| * | | am 73e150c8: provide link to backup guide above the foldScott Main2010-09-201-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread * commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed': provide link to backup guide above the fold
| | * | | provide link to backup guide above the foldScott Main2010-09-201-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I84ad3fbd4c3c7793fbf330d6a2be5cab611a9b26
* | | | | am 8e1b84e7: Merge "Some battery improvements:" into gingerbreadDianne Hackborn2010-09-205-20/+107
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp * commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b': Some battery improvements:
| * | | | Merge "Some battery improvements:" into gingerbreadDianne Hackborn2010-09-205-20/+107
| |\ \ \ \
| | * | | | Some battery improvements:Dianne Hackborn2010-09-205-20/+107
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New API for iterating over history that will allow a better implementation in the future. - Now do writes asynchronously. Also improve the documentation for Activity.onRetainNonInstanceState(). Change-Id: Idf67f2796a8868eb62f288bcbb2bad29876c8554
* | | | | am d3301e9f: Add mdpi images for overscroll EdgeGlow.Mindy Pereira2010-09-202-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp * commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c': Add mdpi images for overscroll EdgeGlow.
| * | | | Add mdpi images for overscroll EdgeGlow.Mindy Pereira2010-09-202-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes b/3019020 gingerbread needs overscroll resources for MDPI devices. Change-Id: I42b2557d97f7766c30449f461090a05ef8e35c18
* | | | | am d2319d8d: Merge "New error status for "destination file already exists"." ↵Steve Howard2010-09-203-10/+30
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp * commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1': New error status for "destination file already exists".
| * | | | Merge "New error status for "destination file already exists"." into gingerbreadSteve Howard2010-09-203-10/+30
| |\ \ \ \
| | * | | | New error status for "destination file already exists".Steve Howard2010-09-203-10/+30
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changing the behavior of the local URI column slightly to better match the spec -- it should return the client-provided destination so that it's valid even if the download failed. Change-Id: Ibf9c07519e647e677ebac8b334b9f2e930e47033
* | | | | am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbreadJohn Wang2010-09-201-34/+81
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp * commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6': Use PhoneBase in the phone list.
| * | | | Merge "Use PhoneBase in the phone list." into gingerbreadJohn Wang2010-09-201-34/+81
| |\ \ \ \
| | * | | | Use PhoneBase in the phone list.John Wang2010-09-171-34/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 3001613. Only use PhoneBase (not PhoneProxy) in CallManager. Both PhoneBase and PhoneProxy implement Phone interface, such as dial(). The real implementation, for example in GSM, is in GSMPhone extending from PhoneBase. So that foregroundCall.getPhone() returns GSMPhone obj. On the other hand, PhoneFactory.getDefaultPhone() returns PhoneProxy obj, which has a class member of GSMPhone. Therefore for phone returned by PhoneFacotry, which is used by PhoneApp, phone.getForegroundCall().getPhone() != phone Change-Id: I8a304098dd86762aaee56fb3c8b76c883e8c9a4f
* | | | | | am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as ↵Brian Swetland2010-09-202-14/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well as /system/lib/egl" into gingerbread Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp * commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760': support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
| * | | | | Merge "support loading EGL libraries from /vendor/lib/egl as well as ↵Brian Swetland2010-09-202-14/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | /system/lib/egl" into gingerbread
generated by cgit v1.1 at 2025-03-26 23:08:29 +0000