drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,603 Commits 1 Branch 0 Tags
Commit Graph

159603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
3f0afd3544 am c7b28e74: am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit 'c7b28e741062e197644f2c2f29b55a75b4ccb39e':
  Ensure wakelock is released unconditionally.
 2014-09-23 17:22:59 +00:00
Jeff Brown
ff957b0837 am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit 'e5121f0e6ab3303f22c7db8925db907d95bc82aa':
  Ensure wakelock is released unconditionally.
 2014-09-23 17:12:03 +00:00
Jeff Brown
e012dedfba am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit '86cb67b199e22136f461a4798bed32c98e6e145c':
  Ensure wakelock is released unconditionally.
 2014-09-23 17:00:03 +00:00
Jeff Brown
47b32c569a am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit '28c9590b90215230b65d98c4d816e0d776a07540':
  Ensure wakelock is released unconditionally.
 2014-09-23 16:48:40 +00:00
Jeff Brown
510e8cdc8d Merge "Ensure wakelock is released unconditionally." into lmp-dev 2014-09-23 16:39:40 +00:00
Jeff Brown
a273924b8c Ensure wakelock is released unconditionally. 
Bug: 17610254
Change-Id: I8b846c867edaa5038e34d4c857550735b121a1d9
 2014-09-23 09:38:04 -07:00
George Mount
9296bcc75f am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit '27b46d350dcd89efde25dc1e0bae35156a6c1346':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 15:53:42 +00:00
Selim Cinek
b3f22d3c4b am 51bc3416: am e9d27cb2: am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit '51bc341620f3aa7e63f5dd33954ececf9503f6cf':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 15:53:38 +00:00
Adrian Roos
3da2015467 am 2d9f7f57: am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit '2d9f7f573e5255a84b74da923124f3cac1f094a7':
  Ensure that force lock works with accessibility enabled
 2014-09-23 15:53:29 +00:00
Paul Jensen
32bcf376ad am 4d8b2f76: am b3322d8a: am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit '4d8b2f76b3a144de3656001a3d42cf08c6e39bc3':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 15:53:12 +00:00
Ricardo Cervera
4672758947 am d4880677: am 22f28c1c: am 63bff695: am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit 'd488067718c69dd3e946740049967dc07e931392':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 15:52:18 +00:00
David Friedman
e30e4c9ecb am 48d50e56: am 20285cdf: am a80fa7a4: am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '48d50e56ab6243f8c72b69ebee90d208404d37b7':
  Fixes two typos, one in each file.
 2014-09-23 15:52:13 +00:00
Chris Craik
3bf8c64d78 am 808583ff: am 1918d884: am a0d0798a: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit '808583ffbbb461c429a8308034dba632d167f2c6':
  Reject transparent draws more conservatively
 2014-09-23 15:51:57 +00:00
Vinit Deshpande
28a15a1fe0 am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '6839bf68d8f557e7d31410a3f88f2e32a4f1a2b8':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 15:51:52 +00:00
Lorenzo Colitti
11ebb69d50 am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'd0d59156e69d9f33eea68e783b2835867bdaa67f':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 15:51:32 +00:00
Amith Yamasani
02f6a62d44 am a9d87e8d: am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit 'a9d87e8d1f869099a0b9cf75ecfc1e7dfe2982b1':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 15:51:26 +00:00
Dianne Hackborn
3e094bd9cf am 5e956370: am 77b6a9bf: am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '5e956370a5aea436bd18c490f6c3ac8061d62e89':
  I am such an idiot.
 2014-09-23 15:51:19 +00:00
Yuncheol Heo
51f0290a42 am 5f024c13: am 8705586c: Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 
* commit '5f024c135ea8ccd93f5201a9d47bb4407cb51475':
  Fix the hotplug behaviors in TV.
 2014-09-23 15:51:13 +00:00
Yigit Boyar
1138c2ffec am 15101435: am 598dc534: am 33e2fd32: am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '1510143574542bc9d412c3aed71039ca4702b5f9':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 15:51:09 +00:00
Amit Mahajan
c78b729355 am 02f897a9: am 316c7729: am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '02f897a954c14855cd142cade2065901134973da':
  Don't disconnect data for some carrier
 2014-09-23 15:50:55 +00:00
xinhe
f7d75f26f4 am cad7b8cd: am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'cad7b8cd31e936337a63f9309c2934607d7493d2':
  Fix for empty RSSI triangle after boot
 2014-09-23 15:50:37 +00:00
Ruben Brunk
0498c04857 am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '04ddd954e3ccad653441762d1f289b2945dc061e':
  camera2: Docs update for available AF modes.
 2014-09-23 15:50:33 +00:00
Ruben Brunk
79a7e78c0d am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit 'b95f6de6a4b23b7e95c61446f4879dbedf444156':
  camera2: Add missing whitebalance mapping.
 2014-09-23 15:50:27 +00:00
Alan Viverette
a83de9cf9d am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '17cdbe10616e38450064d758232f78c7cacc83f4':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 15:50:22 +00:00
Ruben Brunk
e2120388c8 am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '969be13ecc9ec7d9e35575d46f22fdd2da5866af':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 15:49:58 +00:00
Adam Lesinski
467475bab8 am 6b746c15: am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '6b746c150c7ec6ca41346224a0bc4a4d4910a472':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-23 15:49:54 +00:00
Vineeta Srivastava
5d054b3b4e am 2e8e7425: am a8ee7910: am a9f4fadd: am cd938b83: Merge "AT&T short dialing code" into lmp-dev 
* commit '2e8e74250f0b8dda543a41a0903f9a56cef09f6e':
  AT&T short dialing code
 2014-09-23 15:49:45 +00:00
John Reck
5315ce4bf1 am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit 'fa19b7aa01e26d5a24e05b1bb963f9bd8d079bf7':
  Aggressively trim memory for system_process
 2014-09-23 15:49:41 +00:00
Dianne Hackborn
7367ed9aa9 am fbd5acbf: am 42540aed: am d2e6afcb: am bb9b4e06: Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev 
* commit 'fbd5acbff186b5f585b9506490c9039ceecc3326':
  Fix issue #17609716: Frequent crash in system_server (RT restarts)
 2014-09-23 15:49:18 +00:00
Wink Saville
2ed12a198f am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev 
* commit 'd428d7bf62be4dbe39489947eaea98f6fc933e08':
  Cleanup NetworkCapabilities.
 2014-09-23 15:49:08 +00:00
Svetoslav
8b366ef3ee am cd343325: am e821fc43: am 87c9fb76: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev 
* commit 'cd3433251e0a1e1141ee11fd5b72864b56f6b807':
  Loosen the constraint for releasing a shared file.
 2014-09-23 15:48:51 +00:00
Svetoslav
95ba851d64 am f813b27b: am 68c883a5: am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev 
* commit 'f813b27b71e6f7be8f04b4b95f73e38760ef86d5':
  Fix a bug in parsing app widget state XML.
 2014-09-23 15:48:46 +00:00
George Mount
a8ec8de28e am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit 'a17365ef8617e3a0147b906d621d16e5c9e6373b':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 14:55:13 +00:00
Selim Cinek
817d31278a am e9d27cb2: am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit 'e9d27cb2553a4f153abff5a2b26b4f24496174fe':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 14:55:09 +00:00
George Mount
00e28744af am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit 'd0f0f86b3a6a8086efc468a0ee8728605cdfc9e3':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 14:44:48 +00:00
Selim Cinek
cdee13f4db am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit 'd6a4bd90e04a7c43abb3611d4e66de60eb5ee2bd':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 14:44:44 +00:00
George Mount
004b7a3f19 am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit 'cced7645aae3e2fd65297ac75cecfde31dc1c636':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 14:33:08 +00:00
Selim Cinek
3caab56c21 am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit 'd08372bc89eb0a1de3dee72a270b65b10701aad3':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 14:33:04 +00:00
George Mount
cbd333b256 Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 2014-09-23 14:27:36 +00:00
Selim Cinek
0eba4e279f Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 2014-09-23 14:25:09 +00:00
Adrian Roos
f035321029 am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit 'a2145ac092ea54d3a2587b9134703529f0f98d21':
  Ensure that force lock works with accessibility enabled
 2014-09-23 14:22:07 +00:00
Adrian Roos
40f918f661 am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit '034d1d039b63d0d32d5d29313c354e351888b4b9':
  Ensure that force lock works with accessibility enabled
 2014-09-23 14:10:22 +00:00
Adrian Roos
18321f5337 am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit 'b98fd933fd7c5ca2c75849a013fc942ec211b5ee':
  Ensure that force lock works with accessibility enabled
 2014-09-23 14:00:27 +00:00
Adrian Roos
6ec76b0ff9 Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 2014-09-23 13:48:42 +00:00
Selim Cinek
ba5b3a0b4e Fixed a bug where the alarm could overlap in QS 
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
 2014-09-23 15:39:54 +02:00
Paul Jensen
03ba6fe04b am b3322d8a: am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit 'b3322d8a6db948b718f8d63ba5de233dbeac669a':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 12:29:59 +00:00
Paul Jensen
337553071a am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit 'f19809653a6601459c5a9167396bb461a6d2ee52':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 12:18:46 +00:00
Paul Jensen
7defcc8590 am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit '1c637c5fef678a82fd1f2c380d41ed6ebcb5bf2e':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 12:08:22 +00:00
Paul Jensen
74971c75dc Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 2014-09-23 12:00:35 +00:00
Ricardo Cervera
c0a563f0a6 am 22f28c1c: am 63bff695: am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '22f28c1c7ba678a6f7c871abb75fcae2d3f150c5':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 04:12:40 +00:00