Commit Graph

249922 Commits

Author SHA1 Message Date
Sid Soundararajan
1f07c85fa8 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev
am: ea98d35d62

* commit 'ea98d35d62ec9e8273e5e632feec167c24a90a15':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I441ff96ed9c5e84aee38e68b5a153c3a39f3d63b
2016-05-17 17:49:50 +00:00
Amit Mahajan
65ca16ebab Merge "OMADM intent sent by both system and apps." into nyc-dev 2016-05-17 17:41:11 +00:00
Wale Ogunwale
e76407c7f3 Make Recents activity invisible when it is behind a translucent activity
We don't want the recents activity to be visible behind a translucent
fullscreen activity. Instead we want to show the home activity behind
the translucent activity.

Bug: 28246419
Change-Id: I0364a592d7d84c88b39b359431492d0395b0f051
2016-05-17 10:38:02 -07:00
Sid Soundararajan
1aae32b44a Merge "Move onStart update of recents tasks to onResume" into nyc-dev 2016-05-17 17:36:50 +00:00
Robin Lee
607fa836b2 Merge "Make some of the UID-based VPN code reusable" into nyc-dev
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
2016-05-17 17:36:43 +00:00
Sid Soundararajan
ea98d35d62 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev 2016-05-17 17:36:42 +00:00
Phil Weaver
11ece94702 Merge "Hide UiAutomation#destroy as test api." into nyc-dev
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
2016-05-17 17:32:24 +00:00
TreeHugger Robot
4920698e17 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00:00
Chong Zhang
a409fada63 Merge "Apply final crop during surface preservation" into nyc-dev
am: 2d4d408a5b

* commit '2d4d408a5be45b027e43fee99cc3a44b6a556c66':
  Apply final crop during surface preservation

Change-Id: Ica109f6bffb84ad1dc182a366be2d1fd9a1d17f1
2016-05-17 17:25:04 +00:00
Chong Zhang
2d4d408a5b Merge "Apply final crop during surface preservation" into nyc-dev 2016-05-17 17:17:52 +00:00
Phil Weaver
efae6e9ff1 Merge "Content description for FloatingToobar overflow." into nyc-dev
am: 43141e33f7

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

Change-Id: Id7656042c60e76a5afa593df1613e1a609366507
2016-05-17 17:15:25 +00:00
Phil Weaver
43141e33f7 Merge "Content description for FloatingToobar overflow." into nyc-dev 2016-05-17 17:08:29 +00:00
Jae Seo
18c0cfb075 TIF: Throw a more appropriate runtime exception when building TvInputInfo
Bug: 28775591
Change-Id: I934c8d7fed3dda356cdc3bafe51a79f585918ed0
2016-05-17 10:06:36 -07:00
Michael Wright
778e3b91ac DO NOT MERGE Remove Pointer Capture API
The underlying implementation needs to be completely rethought. If a
process crashed while you were in pointer capture mode, you were
pretty much stuck in it. If the mouse happened to move outside of
your bounds right before you called the API, you'd never actually get
an event (whatever it was hovering over would). There's no easy way
for the system to tell you when you enter or exit this mode because
it doesn't actually track who the current request is from.

These are all solvable, but not in the N time frame. Maybe next time.

Bug: 26830970
Change-Id: I03efd63c499b86dc278491ca3284566c1965581f
2016-05-17 18:02:37 +01:00
Michael Wright
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
2016-05-17 18:02:32 +01:00
Sergio Giro
57b8a73d0e ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

Change-Id: I2d91ee38fe93f600bec89651416e84ab83ef9d4a
2016-05-17 17:55:27 +01:00
Wale Ogunwale
6874114a95 Correct activity lifecycle when forcedResize activity is finished
- Regerssion introduced ag/1039265. We still need to resume the
starting activity in a task with an overlay activity is the starting
activity is the overlay activity. Otherwise the activity below it
might not be moved to the paused state.
- Also, we don't want to clear starting window for activities that
aren't behind fullscreen activities as we need to display their
starting window until they are done initializing.

Bug: 28808506
Bug: 28751186
Change-Id: I9a1a5feecea2ed3592a4064fca80e240a3bce387
2016-05-17 09:40:02 -07:00
Felipe Leme
a701cad320 Use batching to set firewall rules.
Netd now provides an option to flush all uids for a given firewall
chain. Using this option is particularly useful when setting the
fw_standby chain, since over time the device will have dozens of idle
apps.

For example, in a Nexus 5X with 45 idle apps, setFirewallUidRules() at
boot was taking 1044ms, and after this change it dropped to just 32ms.

BUG: 26675191
Change-Id: I7016ba646b872f80d0b27a56b867c0b6080d2516
2016-05-17 09:31:00 -07: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
aa733e0b41 Merge "ZygoteInit: warm up JCA providers during preload" 2016-05-17 15:50:50 +00:00
Zoltan Szatmary-Ban
07e232371f Merge "Introduce system API to get source of user restriction" into nyc-dev
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iec3a08471bc56a3aec1aff43b3c7361931c13539
2016-05-17 15:24:20 +00:00
Zoltan Szatmary-Ban
690c2ea117 Merge "Introduce system API to get source of user restriction" into nyc-dev 2016-05-17 15:16:56 +00:00
Shibin George
6e22f2dad1 Merge "Synchronize access of mSubscriptions" am: d065220a54
am: 8434b4cf1b

* commit '8434b4cf1b0c78cc371bab445edeb2d0992b571e':
  Synchronize access of mSubscriptions

Change-Id: I95c81631a171257594adc0af47e0a436d560d20e
2016-05-17 14:19:59 +00:00
Shibin George
8434b4cf1b Merge "Synchronize access of mSubscriptions"
am: d065220a54

* commit 'd065220a547c985be3bd17bb8f2ff473427aa978':
  Synchronize access of mSubscriptions

Change-Id: I5b28986dd770abbeeb9aaff872577230c3b56abd
2016-05-17 14:14:59 +00:00
Treehugger Robot
d065220a54 Merge "Synchronize access of mSubscriptions" 2016-05-17 14:07:15 +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
Robin Lee
dbf0210f6f Return legacy VPN info regardless of lockdown mode
This stops Settings from telling the user detailed information, and
doesn't really protect anything secret -- privileged apps can already
tell that there's an active VPN by looking at network info.

Change-Id: I9c2a3cab6dff1b62e94a9e0735dccde226fd26a3
Fix: 28624328
2016-05-17 14:31:52 +01: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
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
Robin Lee
557b68a5c2 Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev
am: bc73347152

* commit 'bc73347152a3562a7f957a07433d64912f4acd83':
  Skip 'network may be monitored' if dying or locked

Change-Id: I290dd15bf5ec66fb0ec54171809f20c4990fb998
2016-05-17 09:25:17 +00:00
Clara Bayarri
60d0910dc8 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I1b5a1455199ba8e6ef6c877d7f4d4b13256eb1c6
2016-05-17 09:21:15 +00:00
Robin Lee
bc73347152 Merge "Skip 'network may be monitored' if dying or locked" into nyc-dev 2016-05-17 09:17:21 +00:00
Clara Bayarri
bee2648027 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 2016-05-17 09:12:36 +00:00
Narayan Kamath
1f7f9bc780 Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev
am: a8b4f75978

* commit 'a8b4f7597842b17b44e1ea859f218d610789e277':
  PackageManager: Clear foreign-dex markers when the app is uninstalled.

Change-Id: I0c04c86d35999414b596baa92b98425aca2da00e
2016-05-17 08:40:39 +00:00
Narayan Kamath
a8b4f75978 Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev 2016-05-17 08:31:44 +00:00
Martijn Coenen
6136730e3b Adddress NFC API review comments.
Bug: 28775492
Change-Id: I01befba3435f0d882787fecabd3c1041fe7260d7
2016-05-17 09:09:15 +02:00
Baligh Uddin
b07399fd73 Import translations. DO NOT MERGE
Change-Id: I6803d5388c5e4c7fa188d908f35962170c4da1dc
Auto-generated-cl: translation import
2016-05-16 23:23:56 -07:00
Seigo Nonaka
e9f54bfde2 Use original theme for SuggestsionsPopupWindow
Some application set textColorPrimary as white, as the result the
suggestion window draws white text on white background.
To avoid this UX, always uses original theme for suggestions popup
window.

Bug: 28371168
Change-Id: I2ef41d162b63a7e277decc2065609a7d43590afe
2016-05-17 13:53:21 +09:00
Ruben Brunk
96b20bb585 Update VrListener location permission.
- Grant coarse location permission to preinstalled system
  application that implements a VrListenerService when the
  VrListenerService has been enabled in Settings by a user.

Bug: 28768855
Change-Id: I7cb7f7b980a714f100f50e23dd9f503b9a3fa201
2016-05-16 20:53:52 -07:00
David Friedman
a41977d0d1 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35 am: 86b5f72636
am: c19cf44966

* commit 'c19cf449664e985f0bb07833daadf533ec0dfa1c':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I378bed62f060bbbf99d103f206088dcd048525bd
2016-05-17 03:34:15 +00:00
David Friedman
c19cf44966 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs am: bf56921d35
am: 86b5f72636

* commit '86b5f726368c873c8503ed7a8042cfa954f5e1a0':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I83923831a50a94f46d05e18cfc4d69c68b2e58ed
2016-05-17 03:29:11 +00:00
David Friedman
86b5f72636 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs
am: bf56921d35

* commit 'bf56921d3527ad0652f4224b422dd611ec1a6fee':
  Docs: CL for continuing work on tactically merged N-DP3 docs.

Change-Id: I8150c709818232cf24e4d967de45aeb1bd4c2956
2016-05-17 03:23:46 +00:00
David Friedman
bf56921d35 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs 2016-05-17 03:17:41 +00:00
David Friedman
182e8b53ea Docs: CL for continuing work on tactically merged N-DP3 docs.
This CL continues the work from ag/1036623 and ag/1036124.

Change-Id: Ic1e026ed9f53a389a0435c2b8e21edfe9ef635c4
2016-05-16 19:39:08 -07:00
Kevin Hufnagle
5deb0d6dfe cherrypick from mnc-io-docs docs: Updated Billing API documentation
(for Project Nickel).

This CL is a continuation of CL 1026559.

Added references to Project Nickel (rounded and "relevant" pricing
for each country where an Android app is published) within overview
and reference pages. Also added discussion of pricing templates and
the associated operations in the "administration" page.

Finally, completed minor touch-ups to billing administration section
(removed unhelpful links, updated screen captures).

Bug: 28204935
Change-Id: Id194c17b5dd23fc89b9b69cf90e601993a66d014
Original-Change-Id: I917d06876d1525f24cb26a55a39cd64ae479b8f8
2016-05-16 18:48:53 -07:00
Chong Zhang
cc3eccf578 Apply final crop during surface preservation
Apply stack crop to the preserved surface so that it doesn't stick over
the dock divider.

bug: 28567495
Change-Id: Ib7a9d8ec82a7752ecbef60a86f441e35e16ac877
2016-05-16 18:25:45 -07:00
smain@google.com
28445c4d7d invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever).
bug: 28801246

Change-Id: I1c1dbfc20ec4bdd16ede76d4cbad6474bafafb55
2016-05-16 18:22:06 -07:00