315693 Commits

Author SHA1 Message Date
Russell Brenner
d0168c6025 Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev am: 27ce8b0d34
am: 47af6876f8

Change-Id: I59c6e4d8686235c636550abc1f8535574502dabc
2017-04-12 16:25:56 +00:00
Svet Ganov
59e8e3d747 [DO NOT MERGE] Allow multiple toasts for the focused app
We don't allow apps to add multiple toast windows to
prevent an attacker to keep adding the same toast as
a workaround for our measure to ensure toast windows
are removed after a timeout. The may cause backwards
compatibility issue for apps that add multiple toasts.
While we need to fix the security vulnerability it is
desirable to make the fix as backwards compatible as
possible. This change allows the focused app to add
as many toast windows as it wants since they will be
removed after the timeout and once the app is not the
one the user uses it will lose the multiple toast add
capability.

bug:30150688

Change-Id: I2d9295926cb49b5bb80c7af2546872ff8ca22c64
(cherry picked from commit 296a60acc3d67cea23bae167dbcb51c0d0d60b23)
2017-04-12 16:23:40 +00:00
Russell Brenner
47af6876f8 Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
am: 27ce8b0d34

Change-Id: If690b190990b1ca49a5efbc1994b8b09b332630e
2017-04-12 16:15:25 +00:00
Julia Reynolds
da78147f29 Clear calling identity before verifying listeners
Also don't throw when can't verify listener.

And update mocking in tests to clean state between tests.

Bug: 36783632
Fixes: 37263567
Test: runtest-systemui-notification, create a secondary user
Change-Id: I5ec95539c9859b67b8fbc7e6a85334e08e6b5a98
2017-04-12 12:08:56 -04:00
TreeHugger Robot
27ce8b0d34 Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev 2017-04-12 16:07:26 +00:00
Android Build Merger (Role)
96d4fb577a Merge "Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev am: 170e3e242b am: 163cdf2fb5" 2017-04-12 16:02:58 +00:00
Tomasz Wasilczyk
c06e2c68d7 Merge "Fix makefile warning." 2017-04-12 16:02:27 +00:00
Jean-Michel Trivi
ea65fc90f3 Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev am: 170e3e242b
am: 163cdf2fb5

Change-Id: If40faebdb11c9ffe6648b22b43bede52ee6bfeec
2017-04-12 16:00:45 +00:00
Robert Greenwalt
048800d62e Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a am: 03f9a489cb am: 7c1460f388
am: 8961810748

Change-Id: I9406681dd70095b74cfd8b332cd0bb4d2dadad76
2017-04-12 15:59:22 +00:00
Kang Li
7c37964cf2 Updates reportChooserSelection to be synchronized with queryUsageStats
in UsageStatsService, to fix a flaky test.

Bug: 35763877
Test: manually ran the flaky tests for 50 times, to verify that it is
stable.

Change-Id: I56d355bb283275f33bf7a24d0cc5b6454b99a35e
(cherry picked from commit 434f76a8d739060b5c8e96b4824687c19b94ee79)
2017-04-12 15:56:40 +00:00
Jean-Michel Trivi
163cdf2fb5 Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev
am: 170e3e242b

Change-Id: Ie4784a0933e5113b8069da09683a13f4166bc87e
2017-04-12 15:55:12 +00:00
Mike Reed
2cb0826d2e lockPixels is no longer virtual
See skbug.com/6481

With pixelrefs now always (logically) locked, we no longer override
onNewLockPixels/onUnlockPixels. We also must now pass our
address/rowBytes to the base constructor.

These changes allow us to remove duplicate fields in the hwui Bitmap
subclass -- mRowBytes and mColorTable, since these fields are now always
available from the base-class.

However, since this subclass still wants to overwrite const fields in
the base-class (its reconfigure api), change the impl to use the newly
added private method (android_only_reset) to encapsulate this.

Test: hwui_unit_tests and CtsGraphicsTestCases pass

Change-Id: I57a3af1135580513b708f35549a6defb7ac6c04e
2017-04-12 11:52:22 -04:00
Robert Greenwalt
8961810748 Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a am: 03f9a489cb
am: 7c1460f388

Change-Id: I3f7e26ff002616ebc642f7358e846e7bf093437c
2017-04-12 15:49:19 +00:00
Jean-Michel Trivi
170e3e242b Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev 2017-04-12 15:45:58 +00:00
Mady Mellor
2a7305ac8c Merge "Show x for short period of time when activity is PIP'd" into oc-dev am: 56069d7146
am: f0caa83702

Change-Id: I90144f8bf5d7d030aed106116b2e231a62c29bd5
2017-04-12 15:43:26 +00:00
Winson Chung
e3c21e0015 Fix regression when removing task.
- Limit removing the task immediately to when there is a single task
  overlay activity. Certain activities may not work when force-removed
  before the clean up work in removeTask() completes especially if the
  finishing activity is a part of a launch process (ie. trampoline
  activity). This behaviour is only needed for finishing activities that
  have actual task overlays.

Bug: 36761629
Test: Launch SiriusXM, and check that it loads
Change-Id: I34c812ab111819e858fe36b6359f82da717ba459
2017-04-12 08:41:39 -07:00
Mady Mellor
f0caa83702 Merge "Show x for short period of time when activity is PIP'd" into oc-dev
am: 56069d7146

Change-Id: I9c3263bd91e377b4342ab8184444e5230eeab511
2017-04-12 15:38:04 +00:00
Paul Mclean
72bd4e2c52 Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev am: e0e55f535a
am: ffec10fcd5

Change-Id: Ie914337e190ba49d7ce4f0b3a3e485a14a4dd3d2
2017-04-12 15:37:54 +00:00
Robert Greenwalt
7c1460f388 Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a
am: 03f9a489cb

Change-Id: Ic4915213105ba31c63d97187297c652a477e99df
2017-04-12 15:37:53 +00:00
Mady Mellor
56069d7146 Merge "Show x for short period of time when activity is PIP'd" into oc-dev 2017-04-12 15:32:31 +00:00
Robert Greenwalt
03f9a489cb Merge "Adding 20 free short codes for DCB and other purposes"
am: 70fea2df2a

Change-Id: Ic63e088d49796b6e98dc92bc3b0b261958d73e8c
2017-04-12 15:27:23 +00:00
Paul Mclean
ffec10fcd5 Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev
am: e0e55f535a

Change-Id: I8fb4d8f1a1d237aa28780f6f419b9a8fd6131a06
2017-04-12 15:27:20 +00:00
Paul Mclean
e0e55f535a Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev 2017-04-12 15:16:22 +00:00
Robert Greenwalt
70fea2df2a Merge "Adding 20 free short codes for DCB and other purposes" 2017-04-12 15:15:34 +00:00
Mark Salyzyn
8605bd6096 Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev am: b4b44d3bae
am: 27a8061a96

Change-Id: I21f457a5f1710b226a01c8d0c98116304ae85d17
2017-04-12 15:05:48 +00:00
Narayan Kamath
d64abfcf93 Binder: Be forceful about a forceful exit.
We were previously using exit(1) when code servicing an IPC threw
any subclass of Error. That made it much harder to diagnose cases
where that happened because :

- exit runs global destructors, which might prove problematic (see
  linked bug).
- such exits are often due to bugs in application code (things like
  AssertionErrors being thrown) but aren't flagged as such by our
  infrastructure, or by humans for that matter.

To address both issues, use FatalError() so that the runtime can dump
more useful information to the logs before it aborts.

Test: manual
Bug: 36813403
Change-Id: I5826090229109dc7cb19f0c3571c609f990cd36a
2017-04-12 16:04:41 +01:00
Tomasz Wasilczyk
5fccceb2c5 Merge "Initial implementation of Java-based broadcast radio service." 2017-04-12 14:58:41 +00:00
Mark Salyzyn
27a8061a96 Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev
am: b4b44d3bae

Change-Id: Ia548ce29efe31da1fc207cc32ca887468245b88c
2017-04-12 14:55:26 +00:00
Mark Salyzyn
b4b44d3bae Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev 2017-04-12 14:49:17 +00:00
Michael Wright
7783872441 Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev am: 7ecd40c1fc
am: 719d1f06fb

Change-Id: Ib6c86d95d893d306de897ce31b07456fc17a124f
2017-04-12 14:28:27 +00:00
Seigo Nonaka
43c20cf6d4 Introduce FILE_ID for TTC fonts and variation fonts.
A single TTC font or variation font can be used for multiple entry
of FontResult. To share the file contents, assign same URI for those.

Bug: 36494487
Test: android.provider.FontsContractTest passes
Change-Id: Ibf24f216179a6481dee1801cd2dfb68c4bb38fac
2017-04-12 07:24:21 -07:00
Michael Wright
719d1f06fb Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
am: 7ecd40c1fc

Change-Id: I003b2cfcdb10a4d9c999ba9cd575561bf7b70086
2017-04-12 14:23:20 +00:00
TreeHugger Robot
7ecd40c1fc Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev 2017-04-12 14:16:10 +00:00
Seigo Nonaka
5421e81023 Update Typeface.Builder API to reflect API feedback.
- Stop pooling and remove reset method.
- Introduce overloaded constructors instead of setSource methods.
- Make italic parameter boolean and treat "not called" as
  RESOLVE_BY_FONT_TABLE.
- Remove constants and move them to Typeface with private static
  constant.
- Fix JavaDoc.

Bug: 37082657
Test: android.graphics.cts.TypefaceTest passed
Change-Id: I0c50cf3e2d50c0021f7e12bbb7ed7ae89fa1c2a1
2017-04-12 07:12:41 -07:00
Jesse Evans
fc1bfc442c Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
Renames the instant apps setting to reflect what it is for.

Adds the SystemApi annotation to make this field visible
to the resolver and installer.

Test: existing tests

Change-Id: I1651bb101d69bdfdaa63c004435025c68a33cd8e
2017-04-12 07:00:51 -07:00
Orion Hodson
784d3874f6 Unhide MethodHandles.explicitCastArguments()
Bug: 33192564
Test: m -j32
Change-Id: Ic80c9fa8bd81173220f4a1615e35d89b0ed621c2
2017-04-12 14:03:48 +01:00
Pavel Grafov
9c58d46e1d Merge "Improve javadocs for SecurityLog class." into oc-dev am: a9a2bbc647
am: 0b512f27be

Change-Id: I96b2e80ea0eb3b556ae7a48941cdc2579c7957bd
2017-04-12 12:47:44 +00:00
Pavel Grafov
0b512f27be Merge "Improve javadocs for SecurityLog class." into oc-dev
am: a9a2bbc647

Change-Id: I7b6b3d6aa1d27cc09a094b3b01fd6530a2d2ed6c
2017-04-12 12:42:16 +00:00
Pavel Grafov
a9a2bbc647 Merge "Improve javadocs for SecurityLog class." into oc-dev 2017-04-12 12:33:52 +00:00
Tony Mak
35ba7ec539 clear calling identity before calling settings provider
Test: Run a instrumentation test
cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testPhoneAccountVisibility

Change-Id: I29b1dc307e9e127b919aebe4d83ab6311ce36f2d
Fix: 34320197
2017-04-12 13:01:34 +01:00
Johan Toras Halseth
754e98801b Merge "Add helptext to bu command." into oc-dev am: 487e10e22b
am: cb449ccf9d

Change-Id: I8cd00b5ea92dc1ab36d6296acad632f943be078f
2017-04-12 11:18:05 +00:00
Johan Toras Halseth
cb449ccf9d Merge "Add helptext to bu command." into oc-dev
am: 487e10e22b

Change-Id: Id39d64a9634ed91826f6898e97bdbc213ce111a0
2017-04-12 11:06:40 +00:00
TreeHugger Robot
487e10e22b Merge "Add helptext to bu command." into oc-dev 2017-04-12 10:59:59 +00:00
Pavel Grafov
103f797a4c Merge "Introduce DISALLOW_BLUETOOTH_SHARING." 2017-04-12 10:17:19 +00:00
Hugo Benichi
07cd52dc7c Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa0676bf am: 4c63d86db7
am: 3bc2ac3f82

Change-Id: I0811f7f36dc8ec6d1312d21660abce77bba7a47f
2017-04-12 10:11:41 +00:00
Hugo Benichi
3bc2ac3f82 Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa0676bf
am: 4c63d86db7

Change-Id: Iffc7ff461b685f14ced20ac0cd186f31aa4061ad
2017-04-12 10:00:32 +00:00
Philip P. Moltmann
a55825b07f Merge "Do not inset autofill highlight" into oc-dev am: ac1c224cdc
am: 0a87b90e82

Change-Id: Id85d25a445165c38b1f08e5f13744774e4c36fc7
2017-04-12 09:56:32 +00:00
Kevin Chyn
ec36770783 Merge "Implement enumerate in FingerprintService" into oc-dev am: c2f8949b32
am: 0a08ec9f29

Change-Id: I033456a0ddbbe2c8da46e8df79637e249e28c9fc
2017-04-12 09:55:37 +00:00
Hugo Benichi
4c63d86db7 Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7
am: 65fa0676bf

Change-Id: I3f4e5e226d6a6371a6fed02d472d1cad4995c64a
2017-04-12 09:55:06 +00:00
Artem Iglikov
ffe2abed60 Merge "Move inner classes of RefactoredBackupManagerService to their own files." 2017-04-12 09:52:36 +00:00