{"head":"9526f5a4f0ed2ecc1097c02868392f2f51572fd8","size":103,"push_id":44382565,"shas":[["95407b4abc7b7fcb518b6b86c2231711192b4f40","61e299ed354ba2fda136c1007ec41613aefb4ceb@google.com","InCallScreen: call finish() instead of moveTaskToBack() after a failed call\n\nBackground: To improve performance when launching the in-call UI, we never\nactually call finish() on it.  Instead, when a call ends we simply move\nthe InCallScreen to the back of the activity stack.  (This prevents the\nActivityManager from destroying it, meaning that we won't need to re-run\nonCreate() the next time we get launched.)\n\nBut this optimization has a bad side effect: when launching the\nInCallScreen multiple times in quick succession (like when there's an\nerror placing an outgoing call followed by an automatic retry), the\nInCallScreen sometimes gets left in an inconsistent state and the *2nd*\nlaunch attempt fails.\n\n(This sequence is quite rare, but it can happen in one very critical\nscenario: making an emergency call while in airplane mode, where the first\ncall fails because the radio is off, and then we retry after turning the\nradio on.  In that scenario it's very bad for the 2nd call attempt to\nfail.)\n\nHere's the workaround: in the (uncommon) case where we're exiting the\nInCallScreen screen after a failed call attempt, we explicitly call\nActivity.finish() instead of moveTaskToBack().  That means we *will* have\nto re-create the InCallScreen from scratch for the next call, which adds a\ncouple hundred msec to the startup time, but at least we can be sure the\nactivity will launch properly.\n\nThis change has no effect on the behavior of the InCallScreen for regular\nincoming or outgoing calls.\n\nBug: 4172599\nChange-Id: I9499709ed89b519254386e98ffe3b09461a605f6","David Brown"],["a2ed4429b4749131fe2e34a84713a2dffc281a91","61e299ed354ba2fda136c1007ec41613aefb4ceb@google.com","Display a warning when exiting ECM because of an outgoing non-emergency call\n\nBackground: there are two ways to exit ECM:\n\n  (1) Select the ECM notification in the status bar.  That brings up a\n      dialog with wording like:\n           The phone will be in emergency callback mode for XXX\n           minutes. While in this mode no applications using a data\n           connection can be used. Would you like to exit now?\n      If you press \"OK\", we cancel ECM.\n\n  (2) Make an outgoing call to a non-emergency number.  Currently, this\n      causes ECM to be canceled silently with no warning to the user.\n\nThe problem here is the lack of any warning or notification to the user in\nscenario (2).\n\nTo fix this, we now display an alert dialog in scenario (2) right when the\ncall is placed, with the message \"Exiting Emergency Callback Mode\".\n\nTESTED (by simulating ECM and dialing a non-emergency number):\n  - dialog comes up properly (on top of the in-call UI)\n  - you can dismiss the dialog by pressing OK\n  - you can dismiss the dialog by pressing Back\n  - you can dismiss the dialog by turning the screen off\n  - the dialog dismisses itself properly if you let the call end\n    without ever explicitly dismissing it\n\nBug: 4207607\nChange-Id: I094d60144fa21e34ddfe0d749cc151f6d268542a","David Brown"],["765ea81da50905fdcf3bf245ae2f2bbdd69c0206","4d83876564c7df0db05c920065164e186e18e8cc@google.com","Import revised translations.  DO NOT MERGE\n\nChange-Id: I1507ee384f4d26d98dfe70c7f7aa3c999663e007","Eric Fischer"],["6d5d728e4f8f654007ee51a2126d9ca1450fc971","4d83876564c7df0db05c920065164e186e18e8cc@google.com","Mark {0} as a placeholder.  DO NOT MERGE\n\nSome of the translations turned it into \\{0\\}, keeping the phone number\nfrom being substituted in.\n\nExternal issue 15227\n\nChange-Id: I6f07826f2e926ea9b168c00c5e2b325400a12dcf","Eric Fischer"],["a15402434200c0462ceb9f6bb9fd79ab02910dc0","4d83876564c7df0db05c920065164e186e18e8cc@google.com","Import revised translations.  DO NOT MERGE\n\nChange-Id: Id768adb4e76a504e49014dec98519c6e199dd66f","Eric Fischer"],["36656f4d7d5c714c11d11454ef279fe5e6d46044","0b2b4ae829ca0a0d0bd5030d6ac5a4953ff0c051@codeaurora.org","phone app:Fix for wrong call status report in CDMA\n\nWhen there 2 Mobile teriminated calls, that are not conference\n( 1 held call and 1 accepted call ), in case of CDMA network\nthe call status return in AT+CLCC is multiparty. Added fix to\ndetermine if it is a real multy party call.\n\nChange-Id: Ib83abc1a71b57e2903c619b1509442b5b2f1f4f1","Srinivas Krovvidi"],["070ccd288e440ead38ef5e9a6b6dcc078b553f4d","7f5bb03cf507c861269be561971108be8f37d832@chemlab.org","Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/apps/Phone into HEAD\n\nConflicts:\n\tres/values-de/strings.xml\n\tres/values-uk/strings.xml\n\tres/values-zh-rTW/strings.xml\n\tsrc/com/android/phone/CallCard.java\n\nChange-Id: I55f09c34d1856f9c511076b9a83abb961e9ffa76","Steve Kondik"],["e5bd067bda36a69cb6f5542a7ad1be8c6e425719","7f5bb03cf507c861269be561971108be8f37d832@chemlab.org","Fix duplicate translation\n\nChange-Id: I252065e98e53b391cae4a68dc9795cd1d098b866","Steve Kondik"],["a81cdee084aa0cdbda6a421fc9231d80538628f0","aa9009d4ce68dd9d186d29e7a85b3934fab79fc1@gmail.com","Make SIP User-Agent timeout configurable via Settings->Call Settings>Internet Call Settings>Accounts\n\nChange-Id: I8a58c5bda7378c29d03348726c20828569ffceeb","André Černâk"],["27ecfcf337eb9d258e8a14179e4a7ea1865c46cc","0e6e54d00be504db42587674124498f21422d484@gmail.com","Allow the phone incall screen to rotate\n\nThis adds the feature, and setting in the\nCall settings, to allow the phone incall screen\nto rotate.  The default for this setting is off,\nso as to not change the normal user experience.\n\nChange-Id: Ibe0c31a961c325285a9098d6eb6389c6e627999e","Scott Brady"],["9df64db2fe4306514eda20109663c3911aefeedc","4baa4aeeeffe339b5fb4ccc73a14142545fd8a0f@gmail.com","PT-BR: Added missing translations\n\nChange-Id: I0358fa7c940f1b5609f74eca49a825995f3b9126","Gustavo"],["bfcd5e7f0bcf448f86604a258d27f0691be78642","dd860110a62b19214c4ee03aec0abffecb4e86b8@dawitz.de","CM71: Add option to choose in-call-style just like lockscreen style. InCall UI part\n\n- Added on public user demand\n- Adds an option under LockscreenStyle option\n  probably the most userfriendly location for this!\n- Finally replace those lockscreenstyl==1 lockscreenstyle==2 etc\n  check in LockscreenStyleActivity.java with propper enums.\n  That creeped me out for a while, since it was pretty dirty.\n  The code now appeals much more to me\n\nwill resolve possible merge issues, when feature freeze is over\n\nChange-Id: Ibd7d67b5e6aa44721bb99e27fdeed3aca8200058","Sven Dawitz"],["a6198614194abd7065544719ee207aa5a7554962","7f5bb03cf507c861269be561971108be8f37d832@chemlab.org","Merge \"Allow the phone incall screen to rotate\" into gingerbread","Steve Kondik"],["91f4a3ccc2ac2e146f54c4b4b88b62c16595602a","0d54b0cb833004517083bf3ecfa41919afbda9d3@google.com","Fix CDMA three way call handling.\n\nThis should fix all PTS tests cases except AT+CHLD=1 cases. PTS needs\nto be updated for that.\n\n1. Send Call Held Status when mimicing call transition of the second MO call.\n2. Handle sending CIEV: 4 when calls are switched using AT+CHLD =2.\n\nChange-Id: I9b0e6372a8223dda5c5a8d08b4e871d80235753e","Jaikumar Ganesh"],["66ea6922ec79fd5347da96cf3cc0d02d3c7818a6","86cb6171e665ecbd570728e9472123156f0c994b@gmail.com","Traditional Chinese: Translate \"InCall Screen Rotation\"\n\nChange-Id: I6a59a804c0841c9a0f4679cd72e124dae9031a1d","Ladios Jonquil"],["f0a22bff8f464437f5892d9802ceef1725e2104b","0d54b0cb833004517083bf3ecfa41919afbda9d3@google.com","Merge \"phone app:Fix for wrong call status report in CDMA\" into gingerbread","Jaikumar Ganesh"],["11ae53b607436c801abe8b6aa25b8c5c7fc267e6","0d54b0cb833004517083bf3ecfa41919afbda9d3@google.com","Merge \"Fix CDMA three way call handling.\" into gingerbread","Jaikumar Ganesh"],["d2fb0bc9f00e43c2994d6b7464ce678c4e1a0eb8","d0d584e2cf21b8eff079c0dd28f5481fe9661e99@gmail.com","Update Russian translation. Phone\n\nUpdate Russian translation. incall screen rotation\n\nUpdate Russian translation. incall screen rotation","pvolkov"],["6756eb1444fa773a0526e7b2eec7d1e7ad2cddac","60827f1d581f25e5fffa0b6d16c6edf79a2f3ec3@gmail.com","Update Ukrainian translation\n\nSigned-off-by: evgenln <evgenln4@gmail.com>","evgenln"],["a1756930ffa62b4c87c190cccd0a6ddea6ee02e9","3977c8e04008d94beb14cd5c386b829585962c0a@gmail.com","Updated Italian translations: incall screen rotation\n\nChange-Id: I48e905623c07f5f253623cd89a3ca2363ad0ef9f","Eug89"]],"ref":"refs/heads/gingerbread-release"}