summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Ensure wakelock is released unconditionally." into lmp-devJeff Brown2014-09-231-1/+1
|\
| * Ensure wakelock is released unconditionally.Jeff Brown2014-09-231-1/+1
| | | | | | | | | | Bug: 17610254 Change-Id: I8b846c867edaa5038e34d4c857550735b121a1d9
* | Merge "Force transitioning views to be visible when transition interrupted." ↵George Mount2014-09-233-15/+63
|\ \ | | | | | | | | | into lmp-dev
| * | Force transitioning views to be visible when transition interrupted.George Mount2014-09-223-15/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 17553034 When an Activity Transition was interrupted prior to starting the enter transition, the views were not being made visible. Override the return ActivityOptions if interrupted so that the entering activity doesn't launch with a transition when coming back from recents. Change-Id: Id4e00c7bb138babfee4de71247a9df4431376e21
* | | Merge "Fixed a bug where the alarm could overlap in QS" into lmp-devSelim Cinek2014-09-231-1/+4
|\ \ \
| * | | Fixed a bug where the alarm could overlap in QSSelim Cinek2014-09-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When closing the QS panel the alarm did the normal transformation, regardless whether we were in a detail state. This lead to the alarm overlapping with the title. Bug: 17581501 Change-Id: I0318f6778063af11f388e6c7fe8bbb30105ca246
* | | | Merge "Ensure that force lock works with accessibility enabled" into lmp-devAdrian Roos2014-09-232-4/+16
|\ \ \ \
| * | | | Ensure that force lock works with accessibility enabledAdrian Roos2014-09-222-4/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where the force lock gesture was not available when an accessibility service was active, but touch exploration wasn't. Bug: 17514298 Change-Id: Ib42e28f643559040ad5f24d45456b0a41008c647
* | | | Merge "Remove needless locking of mRulesLock that caused deadlocks." into ↵Paul Jensen2014-09-231-16/+13
|\ \ \ \ | |_|_|/ |/| | | | | | | lmp-dev
| * | | Remove needless locking of mRulesLock that caused deadlocks.Paul Jensen2014-09-191-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The locks were added in c006f1 when underlying functions weren't performing locking. In d2a4587 the underlying functions were changed to perform locking but the higher level locking wasn't removed. The higher level locking can now cause deadlocks with the new NetworkAgentInfo locking. This change removes the needless higher level locking. Now all mRulesLock locking only guards simple accesses to the appropriate two data strucures so there is no chance of a deadlock. I verified that all accesses to the appropriate two data structures are guarded by mRulesLock locking. bug:17569997 Change-Id: Id9f4e3d19d6895876925ae32f12460db30359368
* | | | am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools ↵Ricardo Cervera2014-09-231-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image. Bug: 17609483" into klp-modular-docs * commit '44737ea5e5a2f071ffc268f21556aa651a7637db': docs: Fixed Developer Tools image. Bug: 17609483
| * \ \ \ am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: ↵Ricardo Cervera2014-09-221-15/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17609483" into klp-modular-docs * commit '4d0f84bb55957c0f5372b53fe94ddfb53c9d0cf8': docs: Fixed Developer Tools image. Bug: 17609483
| | * \ \ \ am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into ↵Ricardo Cervera2014-09-221-15/+15
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs * commit '556f23aa1ae01832611e5e3b4059b47e6a7a00fb': docs: Fixed Developer Tools image. Bug: 17609483
| | | * \ \ \ Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docsRicardo Cervera2014-09-221-15/+15
| | | |\ \ \ \
| | | | * | | | docs: Fixed Developer Tools image. Bug: 17609483Ricardo Cervera2014-09-221-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
* | | | | | | | am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file.David Friedman2014-09-232-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ec839c95cb0020ee84f23ba65c4c95fb39ebd20': Fixes two typos, one in each file.
| * | | | | | | am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file.David Friedman2014-09-222-3/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6bacce4f24ca05fc95c38ea1e7df75dd176b81c2': Fixes two typos, one in each file.
| | * | | | | | am 8dcf1c32: Fixes two typos, one in each file.David Friedman2014-09-222-3/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8dcf1c32299e2c1c58c053925c572d58f2a74ee9': Fixes two typos, one in each file.
| | | * | | | | Fixes two typos, one in each file.David Friedman2014-09-222-3/+2
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
* | | | | | | Merge "Reject transparent draws more conservatively" into lmp-devChris Craik2014-09-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Reject transparent draws more conservativelyChris Craik2014-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17600162 Transparent draws are not safe to reject for all xfermodes other than clear. Now, to be safe, only perform the rejection for SrcOver draws since other modes are fairly uncommon. We could specifically determine whether the xfermode could change the output given a transparent input, but there's little to be gained from the additional complexity. Change-Id: Ia699ac4bdc4da3353955840b53f1922d3cb1d85d
* | | | | | | | Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-devVinit Deshpande2014-09-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix documentation for Wifi ScanResult.timestampVinit Deshpande2014-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14997906 Change-Id: Idfcf9ade905c7565cc1d59d15aa4362c1b597b72
* | | | | | | | | Merge changes I3ebf0cec,I8635472c into lmp-devLorenzo Colitti2014-09-235-15/+126
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add a throw route to the VPN endpoint. Support non-unicast route types: unreachable and throw.
| * | | | | | | | | Add a throw route to the VPN endpoint.Lorenzo Colitti2014-09-221-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, legacy VPN types that don't send all traffic through a tun or ppp interface, but instead have the kernel apply IPsec transforms directly to the original packets, will try to send traffic to the VPN endpoint through the VPN, which will not work. Bug: 17462989 Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
| * | | | | | | | | Support non-unicast route types: unreachable and throw.Lorenzo Colitti2014-09-224-14/+106
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17462989 Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
* | | | | | | | | Merge "Fix regression in launching CantAddAccountActivity for correct user" ↵Amith Yamasani2014-09-231-6/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | | | Fix regression in launching CantAddAccountActivity for correct userAmith Yamasani2014-09-221-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This activity should be launched for the user calling addAccount() Bug: 17608124 Change-Id: I5d7e47bc625442494dc322ccafdc25f5f5c6aa7b
* | | | | | | | | | Merge "I am such an idiot." into lmp-devDianne Hackborn2014-09-231-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | I am such an idiot.Dianne Hackborn2014-09-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seriously, don't look at this. It is so dumb. Brought up by issue #17307700: retarget a relinquished task is not working Change-Id: I947438d3502f75510e2974211bb78d31008eaa90
* | | | | | | | | | Merge "Remove unnecessary waits in TouchUtil's drag" into lmp-devYigit Boyar2014-09-231-25/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary waits in TouchUtil's dragYigit Boyar2014-09-221-25/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TouchUtil's drag method tries to sync after sending each event which is not necessary. Sync are slow so removing them greatly improves test running time. Bug: 17323559 Change-Id: Ia4ed02b2af44da0d821d93d28f963005d9d7ea79
* | | | | | | | | | | Merge "Don't disconnect data for some carrier" into lmp-devAmit Mahajan2014-09-232-0/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't disconnect data for some carrierJing Zhao2014-09-232-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some network, deactivate PDP connection cause releasing of RRC connection, which MM/IMSI detaching request needs. Without this detaching, network can not release the network resources previously attached. So we are avoiding data detaching on these networks. Bug: 16207801 Change-Id: Ib2ccc04d67f313e1241872b17ab38416607b0b48
* | | | | | | | | | | | Merge "Fix for empty RSSI triangle after boot" into lmp-devxinhe2014-09-232-101/+62
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix for empty RSSI triangle after bootxinhe2014-09-192-101/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After device bootup, the signal strength triangle is empty although there is both voice and data connection. This is due to when TelephonyRegistry doing call back listen register, some APP use mDefaultSubID. However, when the reigister happen, the mDefaultSubId does not exist. Althouhgh it can be update later, if the update event comes too late (especially after the steady state), no ServiceStatechange event can be received anymore. Thus the service is always not available and the signal stength trangle has no chance to be updated anymore. This is a risk condition. Bug:17472622 Change-Id: I772d29e6dd9da212b78fd0d4438b8273e3318dba
* | | | | | | | | | | | | Merge "camera2: Docs update for available AF modes." into lmp-devRuben Brunk2014-09-231-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | camera2: Docs update for available AF modes.Ruben Brunk2014-09-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17588783 Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252
* | | | | | | | | | | | | | Merge "camera2: Add missing whitebalance mapping." into lmp-devRuben Brunk2014-09-221-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | camera2: Add missing whitebalance mapping.Ruben Brunk2014-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17588192 Change-Id: I5d161dd22f2057a33a461157d678d4217a5f88f8
* | | | | | | | | | | | | | | Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-devAlan Viverette2014-09-221-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix inaccurate TypedArray.getDrawable() documentationAlan Viverette2014-09-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation implied that you could override Resources.getDrawable(int) to load custom drawables, which is not the case. BUG: 16635905 Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d
* | | | | | | | | | | | | | | Merge "camera2: Avoid spurious IDLE transitions." into lmp-devRuben Brunk2014-09-224-69/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | camera2: Avoid spurious IDLE transitions.Ruben Brunk2014-09-214-69/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17594247 - Avoid spurious IDLE transitions when waiting for prior requests to complete. - Clean up error reporting for GL thread and CameraDeviceState. - Add error handling for Camera1 ErrorCallback calls. Change-Id: I72850251d8965139b6db2193e91483a3d3409b7c
* | | | | | | | | | | | | | | Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-devAdam Lesinski2014-09-221-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert behavior of Lockscreen Activity Launch to KKAdam Lesinski2014-09-221-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There exists a lifecycle regression where launching an app from the lockscreen (camera, etc.) causes a series of onResume, onPause, onRestart, onStart, onResume. This CL reverts the behavior to what it was in KK, which is to say that the Launcher is first resumed/paused, then the Activity being launched has a simple onRestart,onStart, onResume lifecycle. Bug:17459745 Change-Id: I04091d2f86a929ee972c8d6debc1beb033c135a8
* | | | | | | | | | | | | | | | Merge "AT&T short dialing code" into lmp-devVineeta Srivastava2014-09-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | AT&T short dialing codeJing Zhao2014-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User should be able to dial 0 or 00 in AT&T network. The code should not be taken as MMI Code. Bug: 17314389 Change-Id: I7132f08b633c6539dc0dd4e2d7865adcda795913
* | | | | | | | | | | | | | | | | Merge "Aggressively trim memory for system_process" into lmp-devJohn Reck2014-09-225-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Aggressively trim memory for system_processJohn Reck2014-09-225-1/+51
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16978006 Don't HWUI-accelerate KeyguardScrim Aggressively trim memory as soon as a ViewRootImpl dies or has its visibility changed. Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
generated by cgit v1.1 at 2025-02-10 10:04:38 +0000