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

159788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Monk
d7bd9d61dc Add missing permission for hotspot QS tile 
Bug: 17589487
Change-Id: I2461450863606758b53d4dccdaad74878909ff6d
 2014-09-23 09:25:29 -04: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
David Friedman
e5e34938f2 am 20285cdf: am a80fa7a4: am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '20285cdfd2d12f314fa2033965c72ffd44c88004':
  Fixes two typos, one in each file.
 2014-09-23 04:12:36 +00:00
Ricardo Cervera
93033384aa am 63bff695: am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '63bff695ac470483781878615bc57b0c8cf42fb6':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 04:02:54 +00:00
David Friedman
67b63b799b am a80fa7a4: am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit 'a80fa7a4f2ae987daf429a7078806e28e32e05de':
  Fixes two typos, one in each file.
 2014-09-23 04:02:50 +00:00
Chris Craik
e7028adea5 am 1918d884: am a0d0798a: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit '1918d884c3b5d9de955235b7eea3f2ff59e6ae0c':
  Reject transparent draws more conservatively
 2014-09-23 03:51:46 +00:00
Vinit Deshpande
7fc42be1cd am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '41fa5e868d59a38b8a4094582565189255edf22a':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 03:51:41 +00:00
Lorenzo Colitti
9dca61902d am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'ce24ce4e9cfc38a2ed5a829e485decaa1763a111':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:51:36 +00:00
Amith Yamasani
7c8494e6b1 am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit 'dc8079ac835290e5f7e721a72a9e9f60c7ae048e':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 03:51:32 +00:00
Ricardo Cervera
d41c62041c am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit 'a4d80ca26d32de6fa73910ed173b577218654cd3':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 03:48:45 +00:00
David Friedman
205c86eb66 am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '1695d3de3dad078eff55666cc182943e8f9fbfeb':
  Fixes two typos, one in each file.
 2014-09-23 03:48:40 +00:00
Jay Shrauner
5e6162de62 Fix NPE crash when mPhone is null 
Bug:17609710
Change-Id: Idb99feb6f15fd29809adde51cda1eb0d44e20101
 2014-09-22 20:47:45 -07:00
Chris Craik
29196d2aa5 am a0d0798a: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit 'a0d0798a1c0736e6e2f20985ec1818dd5cbb328a':
  Reject transparent draws more conservatively
 2014-09-23 03:38:06 +00:00
Vinit Deshpande
5ba72fbcdc am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '699ba17f310f88271335851eb0992f9b91579cd1':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 03:38:02 +00:00
Lorenzo Colitti
a8aeb61508 am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit '5570a0d024a83bba723b3847a95128c222607203':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:37:58 +00:00
Amith Yamasani
4872bdd74e am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit '92ab28b14b820888737fce7ff76b503e3f20f0b6':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 03:37:54 +00:00
Chris Craik
15bb1d0385 am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit '737dfe577e7f4198881e9b7ccf360a7f91ab736a':
  Reject transparent draws more conservatively
 2014-09-23 03:21:38 +00:00
Vinit Deshpande
5eab5e6899 am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '14f0aba327294f94d0f2c7f486b21c89aa2094f1':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 03:21:34 +00:00
Lorenzo Colitti
633b7bb8ed am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:21:21 +00:00
Amith Yamasani
eccd4ed797 am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit '278cdb36bf99f6075af6e04a74c29a1701d21cff':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 03:20:14 +00:00
Dianne Hackborn
4a3b843f8c am 77b6a9bf: am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '77b6a9bf00789172203557ef053fd3fab32c596d':
  I am such an idiot.
 2014-09-23 03:06:59 +00:00
Ricardo Cervera
acc0d6de53 am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '44737ea5e5a2f071ffc268f21556aa651a7637db':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 03:06:54 +00:00
David Friedman
086956839a am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '8ec839c95cb0020ee84f23ba65c4c95fb39ebd20':
  Fixes two typos, one in each file.
 2014-09-23 03:06:29 +00:00
Dianne Hackborn
babf33608a am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '2b2e213c7c78cd773bd1cfd756e6f24390e4e28a':
  I am such an idiot.
 2014-09-23 02:48:39 +00:00
Yuncheol Heo
764a6ac2d2 am 8705586c: Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 
* commit '8705586c6c96f340d9e00c2722c55366be0ac42a':
  Fix the hotplug behaviors in TV.
 2014-09-23 02:30:45 +00:00
Yigit Boyar
b9bc79f214 am 598dc534: am 33e2fd32: am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '598dc5349ea1e949b1b32ffc19900f36e253efc9':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 02:30:34 +00:00
Chris Craik
0c8aa8e8fb Merge "Reject transparent draws more conservatively" into lmp-dev 2014-09-23 02:24:50 +00:00