Commit Graph

35924 Commits

Author SHA1 Message Date
Yohei Yukawa
77943308f5 am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 21:54:49 +00:00
Daniel 2 Olofsson
09421fab07 Re-initialize error after attach
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.

Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
2014-03-14 14:49:23 -07:00
Tim Kilbourn
557403250b Merge "Add leanback device features." into klp-modular-dev 2014-03-14 20:38:51 +00:00
John Spurlock
75985bbe2f 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 16:28:15 +00:00
JP Abgrall
4f26139661 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 16:28:09 +00:00
Chad Brubaker
7c2b1625d6 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 16:27:58 +00:00
Svetoslav
358eaa7825 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 16:27:55 +00:00
Yohei Yukawa
fd2f8d4341 am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit '51b921d0e33302b3f431dcfa15bd6588408525ea':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 03:03:08 +00:00
Yohei Yukawa
51b921d0e3 DO NOT MERGE - Preserve the order of InputMethodManager method calls
Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520

This CL allows the Framework class InputMethodManager to behave
in a more deterministic way, that is to say, with an I/O barrier.

InputMethodManager#setAdditionalInputMethodSubtypes is internally
implemented as a RPC to the corresponding counterpart in
InputMethodManagerService. The problem here is that this RPC is
marked as "oneway". As a consequence, this public API call
returns immediately without waiting the additional subtypes are
actually added. This behavior is also not documented so far
unfortunately.

See the following demo code:

  Final InputMethodManager imm = ...;
  imm.setAdditionalInputMethodSubtypes(id, subTypes);
  Final List<InputMethodInfo> ims = imm.getInputMethodList();

Currently, it is not guaranteed that the InputMethodInfo returned
from #getInputMethodList reflects the result of the previous call
of #setAdditionalInputMethodSubtypes because of its undocumented
asynchronous nature.

With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
behaves as if it has I/O barrier. This change should make it easy
for IME developers to use additional subtype mechanism.

BUG: 13033954
BUG: 13291370
Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
2014-03-14 11:52:09 +09:00
Dave Platt
97121c923c Harden NsdManager against null-dereference crashes
Due to race conditions or programming errors, the NsdManager
can attempt to process an asynchronous status message (and issue
a callback to the listener) after the listener has already been
removed from the NsdManager state.  This causes dereferencing of
null objects, and a crash.

Split out the three async-queue message cases:  these are ones
in which message.arg2 does not hold an NsdManager array index
and the code should not interpret this field as if it were.

Add an explicit check for "null listener" (the array index in the
message has already been released), log a warning, and exit early.

Safeguard accesses to the "NSD service type" string from a possibly
null) NsdServiceInfo object... return a constant "?" string rather
than crashing.

Bug: 9016259

Manual cherrypick of commit b1fbb14122a99c62363a949dd634294f5e887ef,
change-ID I7a6ff6842cf035cefbafe2a023ae1fd43734081e in master.

Change-Id: I8d9b7a1763d47d061a0f46b3cb453de4bdb8c2ed
2014-03-13 17:27:03 -07:00
Adam Powell
41685ce983 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-13 23:53:38 +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
Tim Kilbourn
f94b6a93a4 Add leanback device features.
android.software.leanback - the device supports leanback UIs.
android.software.leanback_only - the device ONLY supports leanback UIs.

leanback_only is a hidden feature for now.

Change-Id: I497bd96464125ad81212c804e150f210f3e95af2
2014-03-13 15:02:54 -07: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
f5729a6a15 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-13 18:18:36 +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
Jose Lima
91726f4ea7 Merge "Add banner attribute to app manifest" into klp-modular-dev 2014-03-13 17:40:37 +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
Jeff Sharkey
9c5c56eb51 Run finalizers before counting for StrictMode.
Otherwise we sometimes end up counting objects strongly referenced
by the finalizer queue, and falsely detecting an instance leak.

Bug: 12533002
Change-Id: I144c941a3dfb0cbb837b98e80d2f49ffc9ca13c7
(cherry picked from commit 6f3a38f3af)
2014-03-13 16:07:17 +00:00
Alan Viverette
cf2b65ce7a 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-13 10:01:39 +00:00
Alan Viverette
c25dbb50c3 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-13 10:01:35 +00:00
Alan Viverette
af6288b721 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-13 10:01:30 +00:00
Adam Powell
68ec033b7c 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-13 10:01:15 +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
Jose Lima
f78e312db2 Add banner attribute to app manifest
Change-Id: I28b0dc6dee9623ec7534bb0e741b88f439b48c9f
2014-03-12 18:07:38 -07: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
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
RoboErik
ca9eef6203 b/12068020 Make kb layouts only unique to vendor/product. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
2014-03-12 13:21:08 -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
Jeff Brown
cc9894c825 Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev 2014-03-12 03:42:20 +00:00
Jeff Brown
089886058a 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 19:30:22 -07:00
Justin Koh
df4ee5c8ac Fix possible invalid pointer index in swipe dismiss.
Fix possible invalid pointer index in swipe dismiss: exit out if the pointer
index is -1. Also allow user to cancel this if in swipe mode.

Change-Id: I0f623ced0287679be8dd5c93ab6c67504b82fe9b
2014-03-11 16:27:25 -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
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
Jose Lima
5f0c0498a1 Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 2014-03-11 18:08:53 +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
John Spurlock
cb5f813bb6 am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java
2014-03-11 17:43:46 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
2014-03-11 10:43:31 -07: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