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

152985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Chris Craik
0c8aa8e8fb Merge "Reject transparent draws more conservatively" into lmp-dev 2014-09-23 02:24:50 +00:00
Dianne Hackborn
e2625fcce9 am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '56a9f3ac269c723895948bf524fe378a9afc6636':
  I am such an idiot.
 2014-09-23 02:20:28 +00:00
Vinit Deshpande
3f242a1aff Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 2014-09-23 02:17:08 +00:00
Lorenzo Colitti
1e2b63d91d Merge changes I3ebf0cec,I8635472c into lmp-dev 
* changes:
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 01:46:48 +00:00
Yuncheol Heo
f0f7f1b33d Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 2014-09-23 01:44:11 +00:00
Chris Craik
bc341912b1 Reject transparent draws more conservatively 
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
 2014-09-23 01:22:00 +00:00
Amith Yamasani
fee7ad1619 Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 2014-09-23 01:09:11 +00:00
Yigit Boyar
6333c7e0a0 am 33e2fd32: am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '33e2fd325411e1c9a085aa9b2f2d1bb913ec1367':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 01:00:29 +00:00
Dianne Hackborn
c7437dd7c0 Merge "I am such an idiot." into lmp-dev 2014-09-23 00:57:28 +00:00
Yigit Boyar
79c89b86f5 am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '35b32c8060fdd9eac9a1c62a07d554810a39e45c':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 00:48:33 +00:00
Yigit Boyar
81d9304bda Merge "Remove unnecessary waits in TouchUtil's drag" into lmp-dev 2014-09-23 00:39:32 +00:00
Dianne Hackborn
4a1ef0b171 I am such an idiot. 
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
 2014-09-22 17:39:07 -07:00
Amit Mahajan
f6848fe8d4 am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '4936c2c831a2fe4dbc34343b81d9df9475d90895':
  Don't disconnect data for some carrier
 2014-09-23 00:35:29 +00:00
Amit Mahajan
65811e94bf am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit 'e9259ce9de43096ca1aaf24acb8fcb54c1f69583':
  Don't disconnect data for some carrier
 2014-09-23 00:24:22 +00:00
xinhe
48cc08eed5 am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'e66681ff14548948e3905c77ff03ec546bdd23ce':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:23:28 +00:00
Ruben Brunk
4883dee074 am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit 'a34b25cc9274c1fa35110e2d937b257ac5d87003':
  camera2: Docs update for available AF modes.
 2014-09-23 00:23:24 +00:00
xinhe
f57086a38c am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'f1524b5db229bc08b65df70e8da0e450d153cff3':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:16:05 +00:00
Ruben Brunk
e48fcfb38f am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '12f73fcf874eccaea8e56a4ac547dc86ae9259a6':
  camera2: Docs update for available AF modes.
 2014-09-23 00:16:01 +00:00
Amit Mahajan
322582447e Merge "Don't disconnect data for some carrier" into lmp-dev 2014-09-23 00:15:31 +00:00
xinhe
abbc202431 Merge "Fix for empty RSSI triangle after boot" into lmp-dev 2014-09-23 00:13:22 +00:00
Ruben Brunk
52d62193d6 am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit 'e134e81aa076acbd10551b3d39217e9d438b492d':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:11:03 +00:00
Alan Viverette
51fc9ea5cd am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '20b9a6c458f998d1a5d3896e859a65371db9fce2':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 00:10:59 +00:00
Ruben Brunk
fcb086c8e7 Merge "camera2: Docs update for available AF modes." into lmp-dev 2014-09-23 00:06:15 +00:00
Ruben Brunk
75192fb790 am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:03:49 +00:00
Jing Zhao
2361b2d247 Don't disconnect data for some carrier 
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
 2014-09-23 00:01:38 +00:00
Alan Viverette
60004caeba am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-22 23:58:31 +00:00
Ruben Brunk
9343c3cb7f Merge "camera2: Add missing whitebalance mapping." into lmp-dev 2014-09-22 23:57:20 +00:00
Alan Viverette
53b5cc8773 Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 2014-09-22 23:48:46 +00:00
Ruben Brunk
c50fb39328 am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit 'd782ce534d57c69cb280313b89180dac742937a8':
  camera2: Avoid spurious IDLE transitions.
 2014-09-22 23:41:58 +00:00