Commit Graph

103882 Commits

Author SHA1 Message Date
Lorenzo Colitti
736194dfbf Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
am: 10c1a704c0

Change-Id: Id77a5d6a58e7ab4fdaa0b7c15b824270863b83fd
2019-06-29 02:01:55 -07:00
Eugene Susla
2f27997760 [DO NOT MERGE] Guard against launching permission backup/restore twice per request
am: 8c2fb0ea1e

Change-Id: Ibfd0a70b91eb6ae13b8ad6506e02314521c36084
2019-06-28 20:42:01 -07:00
Shuzhen Wang
6f14111467 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
am: 6da414a8f6

Change-Id: I2ade92a130cc6267a51802633f970d906891d5a6
2019-06-28 17:48:51 -07:00
Eugene Susla
8c2fb0ea1e [DO NOT MERGE] Guard against launching permission backup/restore twice per request
It looks like there is some case where AbstractRemoteService would #run the
same PendingRequest the second time which violates AsyncTask assumption.

Fixes: 135986503
Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I2d072714ee0fad3c365ff7eb191d690056c0931a
2019-06-29 00:20:09 +00:00
TreeHugger Robot
6da414a8f6 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev 2019-06-28 23:54:09 +00:00
Mathew Inwood
cd82f9adff Merge "Restore some greylist entries." into qt-dev
am: f4535c8d51

Change-Id: I3851fed60bedab9748f2d6d53f342f2605ecf78b
2019-06-28 13:18:30 -07:00
TreeHugger Robot
f4535c8d51 Merge "Restore some greylist entries." into qt-dev 2019-06-28 20:01:13 +00:00
Andrew Sapperstein
f08f33b97b Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev
am: 9dd0c5628b

Change-Id: Ia58094614151af83aadd36bb04e0389050dd05be
2019-06-28 10:28:00 -07:00
Andrew Sapperstein
9dd0c5628b Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev 2019-06-28 16:56:04 +00:00
Lorenzo Colitti
b5ad613839 Unit tests for new explicitlySelected behaviour.
ag/7905088 added the ability to pass in acceptUnvalidated without
passing in explicitlySelected. Add unit tests for that code.

While I'm at it, convert a couple of "== 1"s to toBool(), and
update the comments in NetworkAgent.

Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I6b550bd621e3596975f83464c7b4b8a14269120b
2019-06-28 23:57:22 +09:00
Jorim Jaggi
de8014e068 Merge "GestureNav: Limit exclusion rects" into qt-dev
am: ea3216d462

Change-Id: Id52bcbd80028ce0030b7f8b38058e7a786744497
2019-06-28 07:48:06 -07:00
Mathew Inwood
13ffa87a6d Merge "Restore some greylist entries." into qt-dev
am: f76bdce6e0

Change-Id: I320e33be57b8124ff7c132a67c8981d53802f8f5
2019-06-28 07:43:43 -07:00
Matt Pietal
1437b43eb6 Merge "Resolver - Improve flow for Intent URL handling" into qt-dev
am: d73543b588

Change-Id: I158e33705154e00fae20c29ebb7177877beae655
2019-06-28 07:39:26 -07:00
Jorim Jaggi
ea3216d462 Merge "GestureNav: Limit exclusion rects" into qt-dev 2019-06-28 13:48:37 +00:00
TreeHugger Robot
f76bdce6e0 Merge "Restore some greylist entries." into qt-dev 2019-06-28 12:02:43 +00:00
Matt Pietal
d73543b588 Merge "Resolver - Improve flow for Intent URL handling" into qt-dev 2019-06-28 12:02:04 +00:00
Adrian Roos
506267d5f4 GestureNav: Limit exclusion rects
Add limits for system gesture exclusion on the left and right edges.
This prevents non-immersive-sticky apps from totally disabling the
back gesture.

Bug: 135522625
Test: atest SystemGestureExclusionRectsTest

Merged-In: Ib26161663a6aababe803d3c70044f4017bdbe675
Change-Id: Ib26161663a6aababe803d3c70044f4017bdbe675
2019-06-28 17:59:06 +08:00
Mathew Inwood
a5531fa161 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: Ie3dd15c8e17d530d853473a013717e6175383080
2019-06-28 09:23:06 +00:00
Mathew Inwood
3a75f264a8 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I5ac8b8b9b23c3789d80239cf456072cc7dfa1203
2019-06-28 10:15:37 +01:00
Lorenzo Colitti
e6e57b2c8f Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b
am: 5409264cee

Change-Id: Iada14a1fea74197014e75a1112c7a5b35d6b1a1d
2019-06-27 19:40:01 -07:00
Lorenzo Colitti
63f94f411b Merge "Remove all static members from NetworkStatsFactory." 2019-06-28 01:59:31 +00:00
David Nelloms
17dccf5418 Merge "Notify on task display change." into qt-dev
am: 22a5e4e5d9

Change-Id: Ia0ae853122ff3acb755abfebb88dda863ee61080
2019-06-27 18:24:54 -07:00
Janis Danisevskis
ecf4d59309 Merge "Gatekeeper generated aidl cpp bindings" 2019-06-28 00:43:10 +00:00
David Nelloms
22a5e4e5d9 Merge "Notify on task display change." into qt-dev 2019-06-28 00:12:49 +00:00
Hai Zhang
6c162a4e36 Merge "Add link to AndroidX Role library in RoleManager documentation." into qt-dev
am: bde371beb6

Change-Id: I846b027bd1970ebc10a1720e5cc601bf633954f6
2019-06-27 17:04:26 -07:00
TreeHugger Robot
bde371beb6 Merge "Add link to AndroidX Role library in RoleManager documentation." into qt-dev 2019-06-27 23:28:54 +00:00
Sergey
d87bdf9834 Merge "Stable seek bar positioning" am: 874b481cdf
am: ffb8583a65

Change-Id: I049976100806ea78d99bad3201945ceccb0ee8c5
2019-06-27 15:40:25 -07:00
Treehugger Robot
874b481cdf Merge "Stable seek bar positioning" 2019-06-27 22:02:06 +00:00
davidln
a06b4b2fa5 Notify on task display change.
This is a targeted fix for not receiving a task stack change callback
when a task with a resumed Activity is reparented to another display.

Bug: 128932906

Test: manual - launch activity from virtual display onto default display
  in a new task, verify callback notified. atest WmTests
Change-Id: Idabad8379cded664bcf302d5c6fb69564d158eb7
Merged-In: Idabad8379cded664bcf302d5c6fb69564d158eb7
2019-06-27 18:54:00 +00:00
Janis Danisevskis
e7a87a9b06 Gatekeeper generated aidl cpp bindings
Moved Gatekeeper aidl definitions to system/core/gatekeeperd.

Test: Manually tested setting PIN.
      android.keystore.cts.CipherTest#testCanCreateAuthBoundKeyWhenScreenLocked
      android.keystore.cts.CipherTest#testKeyguardLockAndUnlock
Change-Id: Ie3583f5682727b1f9a82d270764c94fce33388ec
Merged-In: Ie3583f5682727b1f9a82d270764c94fce33388ec
2019-06-27 11:32:57 -07:00
Matt Pietal
0d6834adfe Resolver - Improve flow for Intent URL handling
When a URL is detected and all resolved targets are browsers, allow
the user to set a default browser from the Resolver. If one of the
options is an App and not a browser (as defined by
ResolveInfo.handleAllWebDataURI) then direct the user to the settings
page where they can make changes to set the default app for particular
URLs.

On the settings page, highlight the correct setting to change so it's
clear to the user.

Bug: 132071949
Test: Manually resolve URLs with multiple browsers and apps like Reddit/Twitter
Change-Id: Ib8f867a020ecfbb73fa5f1d7db84890c72e4842d
2019-06-27 13:35:11 -04:00
Shuzhen Wang
da189bddc2 Camera: Clarify manual capture behavior for logical camera
Test: Build and read docs
Bug: 136098496
Change-Id: I4a2e9ac66ef79379b9c50932ddc845f56d7d01b4
2019-06-27 10:29:38 -07:00
Tim Joines
35bc777130 Merge "Disable USAP by default on devices" into qt-dev
am: 6c3bbf9e93

Change-Id: I8195f09066a4288da76a10f5e52d44763034c3af
2019-06-27 09:17:06 -07:00
Tim Joines
6c3bbf9e93 Merge "Disable USAP by default on devices" into qt-dev 2019-06-27 16:01:43 +00:00
Jorim Jaggi
b99472439e Request invalidate root when legacy nav bar bg changes
am: 6482df5602

Change-Id: I9e682b0b8bfac5cfb59857c3899e31a060758068
2019-06-27 04:28:17 -07:00
Jorim Jaggi
6482df5602 Request invalidate root when legacy nav bar bg changes
...because only invalidating the root window node will ensure that
onPostDraw() will be called again.

Test: Open com.planeth.rhythm
Fixes: 135207159
Change-Id: I03f814eb7435d91287968f3dcb72f579ab4a35ed
2019-06-27 11:15:14 +00:00
Neil Fuller
8a334f433b Merge "Track change of type from short -> int" am: d854e6e0b4
am: 9881c6f3d7

Change-Id: Iab8db7985b5cdd52b22aa2b72e3273c2d8f2f892
2019-06-27 02:43:34 -07:00
Lorenzo Colitti
4aa8760a68 Remove all static members from NetworkStatsFactory.
NetworkStatsFactory is owned by NetworkStatsService, and any
accesses to NSF data should go through NSS.

Test: atest FrameworksNetTests
Change-Id: Idbd0dbbaeb11313f63474e7ec0e01f974349fc89
2019-06-27 17:39:05 +09:00
Lorenzo Colitti
cf545aa02a Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: bd94f0afd2
am: 92292f556b

Change-Id: If897c9c95fc8571949183c45a99a5c28cb032ebb
2019-06-27 01:31:46 -07:00
Neil Fuller
d854e6e0b4 Merge "Track change of type from short -> int" 2019-06-27 08:26:31 +00:00
Lorenzo Colitti
bd94f0afd2 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." 2019-06-27 07:53:30 +00:00
Eugene Susla
290ca1ec3b Merge "Don't throw from PooledLambda#toString" into qt-dev
am: 667d2c91bc

Change-Id: I8511be019f12ac077dbf7832b9aea741186c3d19
2019-06-26 18:14:43 -07:00
TreeHugger Robot
667d2c91bc Merge "Don't throw from PooledLambda#toString" into qt-dev 2019-06-27 00:51:27 +00:00
Hai Zhang
bae001170b Add link to AndroidX Role library in RoleManager documentation.
Fixes: 136119951
Test: presubmit
Change-Id: Iab4c8617983555b04d7c49b7f9583cf2132d57c8
2019-06-27 00:14:44 +00:00
Eugene Susla
9891f0986c Don't throw from PooledLambda#toString
Turns out there was one more place b/134594642#comment23

Fixes: 134594642
Test: presubmit
Change-Id: I602569c6dd0632641215a7482def2987e10701b2
2019-06-26 15:15:23 -07:00
Kalesh Singh
c26cc3d35a Merge "Route KernelWakelockReader's userspace native wakelock stats collection to SystemSuspend (ISuspendControl::getWakeLockStats())" am: a1cae83560
am: 05b194e058

Change-Id: If9203ea35fec2469561e623da907b8db922f34eb
2019-06-26 12:40:23 -07:00
Govinda Wasserman
5e193b0356 Merge "Add handle suppression to learned state" into qt-dev
am: 079d81a479

Change-Id: I333ba403981edbc002246910636620a311a1f55e
2019-06-26 11:38:04 -07:00
Treehugger Robot
a1cae83560 Merge "Route KernelWakelockReader's userspace native wakelock stats collection to SystemSuspend (ISuspendControl::getWakeLockStats())" 2019-06-26 18:16:34 +00:00
TreeHugger Robot
079d81a479 Merge "Add handle suppression to learned state" into qt-dev 2019-06-26 17:08:37 +00:00
Mihai Popa
243e2d8466 Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into qt-dev
am: 65f73d6bb8

Change-Id: Ia360ab502ee4aad7e4371eadd73bd0ff8db607a7
2019-06-26 04:52:31 -07:00