Commit Graph

6498 Commits

Author SHA1 Message Date
Phil Weaver
1cc8e5f431 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 am: bc176c4fbf
am: c0a46cf445

* commit 'c0a46cf445b620156e27b4d24dbd9f8e90c2d8ee':
  Content description for FloatingToobar overflow.

Change-Id: I2b4a10f15b5956de083b92d3e892aa80fa782017
2016-05-17 17:25:38 +00:00
Phil Weaver
c0a46cf445 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7
am: bc176c4fbf

* commit 'bc176c4fbf3ab075343699f57c5fc2583549e865':
  Content description for FloatingToobar overflow.

Change-Id: Ic8ab8de6fcb433e26e811f87df3ab99e93dc054c
2016-05-17 17:22:01 +00:00
Phil Weaver
bc176c4fbf Merge "Content description for FloatingToobar overflow." into nyc-dev
am: 43141e33f7

* commit '43141e33f7e7da5b7514549cf23f5228915f11d8':
  Content description for FloatingToobar overflow.

Change-Id: I6118131870a8c3bfa51befa9973808fadfa9caf6
2016-05-17 17:16:46 +00:00
Phil Weaver
43141e33f7 Merge "Content description for FloatingToobar overflow." into nyc-dev 2016-05-17 17:08:29 +00:00
Sergio Giro
d91f7f4e71 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8 am: 9d95ab47ff
am: 093adbb330

* commit '093adbb3304098eb8d336ff2bebef335dc94bbb1':
  ZygoteInit: warm up JCA providers during preload

Change-Id: Ib039242b086ee995e9428db043cce47a13860cba
2016-05-17 16:12:43 +00:00
Sergio Giro
093adbb330 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8
am: 9d95ab47ff

* commit '9d95ab47ff318ebb30804dce0890b4de414d5844':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I0c987173ffc212581b21958091e288de531e3e97
2016-05-17 16:06:43 +00:00
Sergio Giro
9d95ab47ff Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41
am: ef42102cf8

* commit 'ef42102cf8d0dd238deb1871bef07f9646622a91':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I7c8ed5394af0c6e1fd25b289ca615125c4e3c38e
2016-05-17 16:01:45 +00:00
Sergio Giro
ef42102cf8 Merge "ZygoteInit: warm up JCA providers during preload"
am: aa733e0b41

* commit 'aa733e0b41e4e15908a4c89e935f824cc5908b4d':
  ZygoteInit: warm up JCA providers during preload

Change-Id: If96e2e482e3fc01c2d3be5eee6d405f9bb5a6571
2016-05-17 15:56:32 +00:00
Sergio Giro
b07595d194 ZygoteInit: warm up JCA providers during preload
This makes the time spent in the first call of an app to
SSLSocketFactory.getDefault() drop from ~240 ms to ~50 ms. In M
it was around ~6ms. This is due to the fact that, while instantiating
the default factory, all providers are initialized.

In order to obtain the timings above, I created an app calling
SSLSocketFactory.getDefault in onCreate and timed it
with System.currentTimeMillis() .

(cherry picked from commit 6cb7b1c476)

Bug: 28545496

Change-Id: Ic5aab3ece609d9fef06fee4ccb83d8371af075b2
2016-05-17 14:39:44 +01:00
Sergio Giro
ec045a8c12 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev am: 5a68af3840 am: d423407254
am: 975bca09fe

* commit '975bca09fe713e29bd650db47e3e2b083ee2b3ab':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I2e64cd4408c2d4afe885eb68502f09c96788579f
2016-05-17 11:21:09 +00:00
Sergio Giro
975bca09fe Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev am: 5a68af3840
am: d423407254

* commit 'd423407254bcdb33e6b19239096c1d5db7d6cdd5':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I2295ea88e46868ded46e276cffb57c341da88d69
2016-05-17 11:15:59 +00:00
Sergio Giro
d423407254 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev
am: 5a68af3840

* commit '5a68af384037f2980215dd45b91c5165c779d4e8':
  ZygoteInit: warm up JCA providers during preload

Change-Id: If7879885eaefbd8499769d688eefde28edd15c87
2016-05-17 11:11:11 +00:00
Sergio Giro
a9f804bf41 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev
am: 5a68af3840

* commit '5a68af384037f2980215dd45b91c5165c779d4e8':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I3cf53b5125331fc3c59183c09c79516a98a62347
2016-05-17 11:10:54 +00:00
Sergio Giro
5a68af3840 Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev 2016-05-17 11:02:20 +00:00
Sergio Giro
6cb7b1c476 ZygoteInit: warm up JCA providers during preload
This makes the time spent in the first call of an app to
SSLSocketFactory.getDefault() drop from ~240 ms to ~50 ms. In M
it was around ~6ms. This is due to the fact that, while instantiating
the default factory, all providers are initialized.

In order to obtain the timings above, I created an app calling
SSLSocketFactory.getDefault in onCreate and timed it
with System.currentTimeMillis() .

Bug: 28545496

Change-Id: I650d4b0435e67e481a41e02b0b538ce5cc993fa3
2016-05-17 10:02:09 +00:00
Christopher Tate
4800712482 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: b7ae368079
am: c4999be6e3

* commit 'c4999be6e34297f595c87cbe4c274e2bc8c1665a':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I8827677fe788f055fcb8c677915219ab179fa4be
2016-05-17 01:14:33 +00:00
Chris Tate
c4999be6e3 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117
am: b7ae368079

* commit 'b7ae3680798aa5dce807015a763a0d017ce7e0c1':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: Idcc14b5f890497a6bf59755d91f66c27f5db3451
2016-05-17 01:09:35 +00:00
Christopher Tate
b7ae368079 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I5987e96ea1d2668037a7f924ad3ee6b5fa96bda8
2016-05-17 01:05:23 +00:00
Christopher Tate
d4056a279d Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I7c894dd6dc494dc5c02ba9e9676b53b0acc281d4
2016-05-17 01:03:59 +00:00
Chris Tate
11d9586117 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 2016-05-17 00:56:49 +00:00
Svetoslav Ganov
4647732c9b Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b am: 4f968024f4
am: c653375758

* commit 'c6533757587f28efdabc7d040750a9bed3062063':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Ic268c41a8867e26982d21a258d22a195e1c171c7
2016-05-16 23:04:36 +00:00
Svetoslav Ganov
c653375758 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b
am: 4f968024f4

* commit '4f968024f4822155e8428b9e5d8aea3114687412':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Ia7acd68dfd29d855e26f11a36e04dde153055d62
2016-05-16 22:55:57 +00:00
Svetoslav Ganov
4f968024f4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: I177256a7f65b3f5c98e5ddc5cf57a7cb47c965ab
2016-05-16 22:51:03 +00:00
Svetoslav Ganov
5f8c5ec9a4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Iebbe27690aeac898807c13ef05c730697dbb406a
2016-05-16 22:48:35 +00:00
Svetoslav Ganov
008d73bd5b Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev 2016-05-16 22:42:49 +00:00
Svetoslav Ganov
a8bbd76d9b Ensure app op restrictions reset when the app that set them dies.
We were not keeping track when an app that set an app op restriction
dies to clean up after that. As a result we may end up with stale
restrictions that will be there until the device reoots - not cool.
This change adds remote binder death tracking and simplifies the
code as adding the formed would have made more complex.

bug:28770536

Change-Id: I7dcaafba2354843a0cdf0206ab1f96625edc5120
2016-05-16 15:34:34 -07:00
Rebecca Silberstein
316f8ce128 Merge "StateMachine: remove final from SendMessage" 2016-05-16 20:58:43 +00:00
TreeHugger Robot
aff5daf558 Merge "Show tooltip when mouse is hovering over an ActionMenu item" 2016-05-16 19:44:31 +00:00
Vladislav Kaznacheev
1a6c27281b Show tooltip when mouse is hovering over an ActionMenu item
Tooltips are already being shown on long press. This CL
invokes the same logic on mouse hover (but with a longer
tooltip duration).

Bug: 24339237
Change-Id: Icba33b317fe737953c6dace91cfe3539a14a1959
2016-05-16 11:21:48 -07:00
Phil Weaver
1d4e18340e Content description for FloatingToobar overflow.
Was missing a content description. The same button is used for
both opening and closing the toolbar, so it needs to be updated
dynamically.

Bug: 28750935
Change-Id: I7f75701ae6af45e5621c36b81003b658479e8b31
2016-05-16 09:41:14 -07:00
Yohei Yukawa
7e4ef1a319 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 am: a1c905caf3
am: c7aeaff113

* commit 'c7aeaff113ab3c525bab5ad79fce05ae895d93a7':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I188b8ebb263d67c1bdcefcd4e9fedf390a199969
2016-05-16 15:37:39 +00:00
Yohei Yukawa
c7aeaff113 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5
am: a1c905caf3

* commit 'a1c905caf3fe89beec6df12b423c6cab33c40879':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: Ifbbbd96c2453a1aa6d933dda6fbd7ebbfdf132a7
2016-05-16 15:34:19 +00:00
Yohei Yukawa
a1c905caf3 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I76b607cd8086f421fc0d552a348a70fc06aa3d9c
2016-05-16 15:31:05 +00:00
Yohei Yukawa
6b078fef33 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: Ie654d6bccd6d4425e0dbefe2833424abdfe52a4d
2016-05-16 15:31:03 +00:00
Yohei Yukawa
833bdcedce Make IMS#clearInsetOfPreviousIme() reliable.
This is a follow-up to my previous CL [1] for Bug 15922840 so that we
can clear the following variables in a more reliable way.
 - PhoneWindowManager#mLastInputMethodWindow
 - PhoneWindowManager#mLastInputMethodTargetWindow

The idea behind CL [2] is that when InputMethodManagerService (IMMS) is
switching from an IME to another IME, IMMS can send a signal to
WindowManagerService (WMS) to remember the current IME's inset so that
the system can continue using it to reduce jank until the new inset is
specified by the next IME.  As summarized in Bug 28781358, however, if
the next IME does not show the window after the IME switch, WMS (or
PhoneWindowManager to be precise) keeps using the previous IME's inset
unexpectedly until the new IME shows its window.  All we have seen in
Bug 15922840 and Bug 26663589 fall into this category.

The idea of this CL is just adding a hidden API to InputMethodManager so
that InputMethodService#clearInsetOfPreviousIme() can surely terminate
the IME transition state managed in PhoneWindowManager, rather than
relying on a hack of calling SoftInputWindow#show() and
SoftInputWindow#hide(), which actually does not work for Bug 26663589.

 [1]: Ib04967f39b2529251e4835c42e9f99dba2cf43f2
      2977eb7b6c
 [2]: I5723f627ce323b0d12bd7b93f5b35fc4d342b50c
      792faa2c16

Note that addressing all the corner cases in [2] still requires lots of
non-trivial change.  Hence this CL focuses only on Bug 26663589 (and
the case we handled in Bug 15922840).

Bug: 26663589
Change-Id: Ib567daa009c1139858dccadcfc6a04465ebecf36
2016-05-15 20:05:56 -07:00
Ruchi Kandoi
558159a578 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 am: b60d0a438a
am: 3bba531ee4

* commit '3bba531ee475be6749553ae884e9bedf63c8e52b':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: Ied6e9a7a24d84f7c8b8264b4e4819b449cd30a2e
2016-05-14 01:41:49 +00:00
Ruchi Kandoi
3bba531ee4 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37
am: b60d0a438a

* commit 'b60d0a438a66b78ed0714a0182d6e84426fb0d88':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I6a6957d530bab235b751a93271d1ae711ffa9c01
2016-05-14 01:39:16 +00:00
Ruchi Kandoi
b60d0a438a Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev
am: 2512ec9e37

* commit '2512ec9e376b0fce213f6d635dfb991c79041031':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I899110108f1200dbc687732963e85083ec5504e0
2016-05-14 01:36:48 +00:00
Ruchi Kandoi
f9f10cbe36 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev
am: 2512ec9e37

* commit '2512ec9e376b0fce213f6d635dfb991c79041031':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I2bb83824d97d426d114f71fdb0b590ce9fd8a12a
2016-05-14 01:36:45 +00:00
Ruchi Kandoi
2512ec9e37 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev 2016-05-14 01:32:54 +00:00
Ruchi Kandoi
fa97fcf7b9 network: Adds the functionality to parse uid in netlink messages.
Netlink notifications about the state of the modem contains uid too.
This patch adds the functionality to add that. It also fixes the bug to
parse the timestamp in the message even in cases where the length is
greater than expected.

Bug: 28527904
Change-Id: I4643bff3eb5b1ffa2dc0b78f1c6947d60487e0d8
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-05-13 15:36:23 -07:00
Rebecca Silberstein
04c7843810 StateMachine: remove final from SendMessage
Removed final from public sendMessage and sendMessageDelayed commands to
unblock unittest development.  This allows tests to verify calls to
sendMessage and sendMessageDelayed.

Also fixed one checkstyle error with import order.

BUG: 28593024
Change-Id: I26e02c3d75049d385ded7891c4fc9967273c27be
TEST: builds
TEST: runtest frameworks-wifi
2016-05-13 15:00:11 -07:00
Adam Powell
0fdf7c326a Merge "Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706 am: a53d9cace1" into nyc-mr1-dev-plus-aosp
am: 60c73947d0

* commit '60c73947d087c8272889d7b8a600b59d391cd98c':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: Id1db07816cc5437b4099123b663e32736283c327
2016-05-13 17:23:25 +00:00
Adam Powell
15021f66fa Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706
am: a53d9cace1

* commit 'a53d9cace1ff124e23ae54dbb68c9a58947a8ce1':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I13c4f6c28551188cf2622a7769b4a11cb67b47bc
2016-05-13 17:20:37 +00:00
Adam Powell
ac3f24fabd Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I178045e372dd962383fbc6d26fe7b99b20f6cf88
2016-05-13 17:17:48 +00:00
Adam Powell
a53d9cace1 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I254e8d1a0b3cc45e3c030ca1cec7e7ecc5dbd91e
2016-05-13 17:17:44 +00:00
TreeHugger Robot
e89dc40706 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev 2016-05-13 17:11:14 +00:00
Adam Powell
86100d18ad Show package icon/label for resolved package-targeted implicit intents
If we're going to show metadata about a resolved implicit intent that
is targeted to a single package with multiple potential targets,
populate the ResolveInfo with the label and icon of the target
package's ApplicationInfo and set resolvePackageName. This helps use
cases such as EXTRA_INITIAL_INTENTS in ChooserActivity, where
sometimes apps set target packages but not components.

Bug 28739056

Change-Id: I8070d341fccc139463c5ac8d66db45fce02252e5
2016-05-13 08:34:37 -07:00
Philip Cuadra
396da016ed Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 5fcabe19a7
am: d49592805f

* commit 'd49592805f91ccd1e79027845d95c382bc59a5da':
  Pinner service for pinning files into memory

Change-Id: I936e8146d9f60dafd5e202a7bc4b1bc2a42ddb38
2016-05-12 22:10:26 +00:00
Philip Cuadra
d49592805f Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df
am: 5fcabe19a7

* commit '5fcabe19a76a06d25358e9889323353f72a94547':
  Pinner service for pinning files into memory

Change-Id: Ia7dc78c32f2beb9c16bf15ac41defc63e51be0e1
2016-05-12 22:07:43 +00:00