Commit Graph

256895 Commits

Author SHA1 Message Date
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
Sergio Giro
1110d6375a ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE
am: 57b8a73d0e  -s ours

* commit '57b8a73d0eb554eff12f6f6bc8d85cbc81897f0c':
  ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE

Change-Id: Ibb39e97681e808220d723c0b14aa24ac9f53c90c
2016-05-17 17:09:30 +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
Steven Ng
7d5ee712cd Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev
am: 914411a1e2

* commit '914411a1e2bdf802dcb04202686f446056ee2da9':
  Enforce permission before checking OEM unlocking setting

Change-Id: I7060bee9cb58d45985e3a9f9a6de21b0aa1ba1ed
2016-05-17 16:42:13 +00: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
Steven Ng
914411a1e2 Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev 2016-05-17 16:38:19 +00: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
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
aa733e0b41 Merge "ZygoteInit: warm up JCA providers during preload" 2016-05-17 15:50:50 +00:00
Android Build Merger (Role)
617ac65092 Merge "Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: fc66ec971c" into nyc-mr1-dev-plus-aosp 2016-05-17 15:30:28 +00:00
Zoltan Szatmary-Ban
c9605c4b3f Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117
am: fc66ec971c

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

Change-Id: Ie80d7671efcb1c7d00ab32d4762dd795c43b9281
2016-05-17 15:30:01 +00:00
Zoltan Szatmary-Ban
96489e0c2a Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117
am: 07e232371f

* commit '07e232371f5249de1c8fe4d8ac277b22b646576c':
  Introduce system API to get source of user restriction

Change-Id: Iaec13f6b56a138b67a066c9eb1c234a7a653c4bd
2016-05-17 15:29:25 +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
fc66ec971c 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: Iab98753f85774d741c5126395d56af194c8b0ca8
2016-05-17 15:23:59 +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
9ed59cfd9c Merge "Synchronize access of mSubscriptions" am: d065220a54 am: 8434b4cf1b
am: 6e22f2dad1

* commit '6e22f2dad1647be6481861f8225174bab26ba7a5':
  Synchronize access of mSubscriptions

Change-Id: Ic68abe3de06f8fb472ecf3e2854c75b69aaff584
2016-05-17 14:24:48 +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
Android Build Merger (Role)
a2ca49860d Merge "Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev am: 5a68af3840 am: a9f804bf41" into nyc-mr1-dev-plus-aosp 2016-05-17 11:17:57 +00:00
Sergio Giro
09334b878d Merge "ZygoteInit: warm up JCA providers during preload" into nyc-dev am: 5a68af3840
am: a9f804bf41

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

Change-Id: I9f958e0ab90d7edb3ec477b0503c5738d0c4c5fb
2016-05-17 11:16:18 +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
Android Build Merger (Role)
eb0d7ae80c Merge "Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev am: bc73347152 am: 36eb3771c1" into nyc-mr1-dev-plus-aosp 2016-05-17 09:28:38 +00:00
Robin Lee
bb20c3dd95 Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev am: bc73347152
am: 36eb3771c1

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

Change-Id: Ie2f98d0592537439a2a16e0647bff34a3880998f
2016-05-17 09:28:13 +00:00
Robin Lee
bf5c3af451 Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev am: bc73347152
am: 557b68a5c2

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

Change-Id: Id3b15eb4c67df5a2a2b37afef800467d3064b1ad
2016-05-17 09:27:48 +00:00
Android Build Merger (Role)
7c085e431e Merge "Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 am: ec200415f5" into nyc-mr1-dev-plus-aosp 2016-05-17 09:25:44 +00:00
Clara Bayarri
21a14dff74 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027
am: ec200415f5

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

Change-Id: Idb6c80f2bd6d20d7960a0db7d2f1fb790defcc98
2016-05-17 09:25:20 +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
Robin Lee
36eb3771c1 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: I8a0818074887fd20c0204098a6824ec9e9589dfa
2016-05-17 09:24:59 +00:00
Clara Bayarri
4cfd27f9aa Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027
am: 60d0910dc8

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

Change-Id: Ia917dd039f7ecde4bc3d093fe7f4900c66dfc590
2016-05-17 09:24:52 +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
Clara Bayarri
ec200415f5 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
am: bee2648027

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

Change-Id: I2efdcb8828da9a455dc80911c3aa87ac7ec6eab5
2016-05-17 09:20:43 +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
Android Build Merger (Role)
f94e2e4764 Merge "Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev am: a8b4f75978 am: 1f7f9bc780" into nyc-mr1-dev-plus-aosp 2016-05-17 08:46:18 +00:00
Narayan Kamath
03c1e809ae Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev am: a8b4f75978
am: 4803983717

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

Change-Id: If68e3bc94332d0873602d51c4328d8dfc106821d
2016-05-17 08:45:34 +00:00
Narayan Kamath
45079ade1c Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev am: a8b4f75978
am: 1f7f9bc780

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

Change-Id: I0d6307a9923a37adfa0ae01830382d026a1a99f4
2016-05-17 08:45:19 +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