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

153744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
60446165d8 Block address families with routes, not NetworkAgent side channel 
Now that we support unreachable routes, use those to block
address families on VPNs. This is a much more elegant solution.
Also update LinkProperties when IP addresses are added and
removed, fixing a TODO.

Bug: 17462989
Change-Id: Ib749d84710dca70d672350b9f129bb91419ec77e
 2014-09-23 10:48:28 +09: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
Jeff Tinker
21069d1914 Implement API review feedback. 
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
 2014-09-23 01:35:41 +00:00
Alan Viverette
c2e08a010e Update refresh icon to tinted material vector asset 
BUG: 17594602
Change-Id: I52f55580bfa22e335608cea0b1fcafe275752bf8
 2014-09-23 01:25:25 +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
Amit Mahajan
722c222b78 am 316c7729: am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '316c7729239118007204ab234068ef44f7aa0bc2':
  Don't disconnect data for some carrier
 2014-09-23 00:48:08 +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
xinhe
6978c6bd3b am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'ec6b28c388cf5cae80b4c0892b6d3aee4fb0e63a':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:35:16 +00:00
Ruben Brunk
034242eb1c am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit 'c947ff9ed0508418e9b566e8fe8cf372f7ca3f2b':
  camera2: Docs update for available AF modes.
 2014-09-23 00:35:11 +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
Ruben Brunk
1193c68232 am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '6b68644e04def4ee8fb664b430bfe0ee1074ed74':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:22:31 +00:00
Alan Viverette
d9759ae5ae am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '8f7812bc780935edea623cce086069925816bdc8':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 00:22:27 +00:00
Adam Powell
744beffb6a Track persistent nested Y offset for fling velocity 
Track the nested offsets applied persistently in AbsListView and
ScrollView. This allows accurate velocity to be reported to nested
fling/pre-fling.

Bug 17548219

Change-Id: I66199c534aca7fb81746eff6d04c931e4c4e48da
 2014-09-22 17:18:42 -07: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