Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,358 Commits 3 Branches 0 Tags
bd5e61fdee35d1adef260141fda9b203ac33f49a
Commit Graph

35588 Commits

Author SHA1 Message Date
John Spurlock
919fc360c3 am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '62826f55be4415684b4e321469298ba43d598bbb':
  Fix doc typos in AppOpsManager.java
 2014-03-14 04:13:00 +00:00
JP Abgrall
e67658d6e2 am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-14 04:12:54 +00:00
Chad Brubaker
e0627cf869 am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-14 04:12:46 +00:00
Svetoslav
eccd4a5f92 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 04:12:42 +00:00
Jeff Brown
ba6b897816 resolved conflicts for merge of 825dd9dd to klp-dev-plus-aosp 
.
Change-Id: I2363c40f641e7e60487354e1710312db2cbbc89a
 2014-03-13 21:10:40 -07:00
Adam Powell
b61d39957b am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '898d6d964cb3b650b5c9bed2276310547e5455e0':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-14 00:40:11 +00:00
John Spurlock
62826f55be am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit 'f6228d95eae7b05dd0015b3062e72c89148e65a2':
  Fix doc typos in AppOpsManager.java
 2014-03-13 22:14:57 +00:00
JP Abgrall
4ecd833ee3 am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-13 20:36:51 +00:00
JP Abgrall
7baa7c8045 Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 2014-03-13 20:33:44 +00:00
Chad Brubaker
78f204aed8 am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-13 18:12:36 +00:00
Chad Brubaker
8e240af51d Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 2014-03-13 18:09:58 +00:00
Svetoslav
fc1d04714e am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-13 17:31:03 +00:00
Svetoslav
11b7d9fa66 Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 2014-03-13 17:26:44 +00:00
JP Abgrall
3f7f3221df ConnectivityService: add support to set TCP initial rwnd 
The value for the TCP initial receive window comes from,
in order,

kernel
  /proc/sys/net/ipv4/tcp_default_init_rwnd

init.rc (via properties)
  net.tcp.default_init_rwnd

properties
  net.tcp.default_init_rwnd

gservices
  Settings.Global.TCP_DEFAULT_INIT_RWND

Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
 2014-03-12 20:22:47 -07:00
Narayan Kamath
6934a16517 am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '194e77aafe32cacc00f69b25bec6eeea67eb0205':
  Remove stray logging statement.
 2014-03-13 01:55:20 +00:00
Jeff Brown
8d377b3ac0 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
  Round off when calculate next step in Seekbar
 2014-03-13 01:54:59 +00:00
Jeff Brown
932d98a013 am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '33282d66155e8d68acea512989ec61cb15fae1ce':
  Fixed typo errors in documentation
 2014-03-13 01:54:56 +00:00
Jeff Brown
c91aae2f71 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
 2014-03-13 01:54:47 +00:00
Jeff Brown
825dd9dd38 am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 
* commit '73bd57f7abdb9eaf9239aa13945990acc6c97cd2':
  Retain display when creating specialized contexts. (DO NOT MERGE)
 2014-03-13 00:15:19 +00:00
Jeff Brown
73bd57f7ab Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 2014-03-13 00:12:53 +00:00
Chad Brubaker
9544120133 am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
 2014-03-12 23:21:02 +00:00
Svetoslav
b628dd825b PrintSpooler crash if printer is reported to have only one color mode. 
bug:11993304

Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
(cherry picked from commit b0d97b87ba)
 2014-03-12 14:20:27 -07:00
Jeff Brown
f86c3a44f2 Retain display when creating specialized contexts. (DO NOT MERGE) 
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
 2014-03-11 20:43:52 -07:00
Adam Powell
898d6d964c am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '7f2c9e9420252a493b7399639f794c8a963444e5':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-11 23:26:38 +00:00
Adam Powell
7f2c9e9420 Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 2014-03-11 23:19:37 +00:00
Alan Viverette
1d29646923 am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '9ebe031cdc916646e95ffcd92dde67e1655be7ba':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-11 23:05:12 +00:00
Alan Viverette
cc9cd2135d am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-11 23:05:03 +00:00
Alan Viverette
3b908e95a3 am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '3c3377a2290764937548de5a49ca8ec28dc98153':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-11 23:05:00 +00:00
Adam Powell
4af04c87ad am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '75958c298477a3d1e556c4fe36e516b9e828c311':
  Fix a bug in submenu presenter priority handling
 2014-03-11 23:04:56 +00:00
Adam Powell
15b13a792c Add a config override for ViewConfiguration#hasPermanentMenuKey 
Allow device overlays to override the behavior of the
hasPermanentMenuKey method at build time. This is useful for devices
that do not behave as the usual autodetection mechanism expects.

Device overlays should set config_overrideHasPermanentMenuKey to 1 if
the device DOES have a permanent menu key or 2 if the device DOES NOT
have a permanent menu key.

Bug 11698700

Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c
 2014-03-11 21:20:13 +00:00
Chad Brubaker
1011960c44 am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit 'decfd7079b622f9135aeb8f7b2ec48005c844c38':
  Add the calling package name to requestRouteToHost
 2014-03-11 19:22:39 +00:00
Dave Allison
2fddd6cd2e am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
 2014-03-11 18:51:42 +00:00
Narayan Kamath
59ed568fa5 am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
  Inform libcore of time format pref. changes.
 2014-03-11 18:42:30 +00:00
Martijn Coenen
1aa5595467 am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field." 
* commit '1507c18f87da9906337237d34184d6ac8f1afabd':
  NFC: getNdefMessage() should throw exception if no tag in field.
 2014-03-11 18:36:17 +00:00
Dave Platt
eed63ad6be am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit '7d8262cb554c41892794f23b92e01b52458288bb':
  Harden NsdManager against null-dereference crashes
 2014-03-11 18:29:34 +00:00
Narayan Kamath
9a25b94430 am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally." 
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.
 2014-03-11 18:16:17 +00:00
Chad Brubaker
a1d7c74449 Remove SO_BINDTODEVICE from VPN protect 
SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
 2014-03-11 10:58:19 -07:00
Chad Brubaker
decfd7079b Merge "Add the calling package name to requestRouteToHost" into klp-dev 2014-03-11 17:51:45 +00:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement. 
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
 2014-03-11 11:08:41 +00:00
Alan Viverette
9ebe031cdc am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '6e6dc23c692b14f5e70ee1453eab726978e4984e':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-11 02:15:26 +00:00
Alan Viverette
7b09a4e5df am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'e910a7ce8b42580b8bc184dfc340859a65e98c80':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-11 02:15:24 +00:00
Alan Viverette
3c3377a229 am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '6a5b7c6ffbef87c6591dbc8f5813f61b3086bfad':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-11 02:15:21 +00:00
Alan Viverette
6e6dc23c69 Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 2014-03-11 02:12:13 +00:00
Alan Viverette
e910a7ce8b Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 2014-03-11 02:12:05 +00:00
Alan Viverette
6a5b7c6ffb Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 2014-03-11 02:11:58 +00:00
Adam Powell
75958c2984 am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '3a153c0de271a004710e5ac545c48778f7e51b12':
  Fix a bug in submenu presenter priority handling
 2014-03-11 01:24:47 +00:00
Jeff Brown
6d71e165ba Merge "Round off when calculate next step in Seekbar" 2014-03-11 00:06:40 +00:00
Jeff Brown
a41ddccdc6 Merge "Fixed typo errors in documentation" 2014-03-11 00:06:25 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00