Commit Graph

410990 Commits

Author SHA1 Message Date
Dmitry Dementyev
b8a61803ec Merge "Handle Account Manager database downgrade." 2019-03-25 19:50:38 +00:00
TreeHugger Robot
d807ddf6a2 Merge "Sysconfig takes precedence over update-time autoVerify" 2019-03-25 19:49:28 +00:00
Zimuzo Ezeozue
245e9c0af9 Merge "Add ExplicitHealthCheckService API" 2019-03-25 19:46:10 +00:00
Julia Reynolds
9b319718d1 Merge "Allow allowed adjustments" 2019-03-25 19:37:27 +00:00
Jeff Sharkey
22b8fb6906 Merge "More apps making assumptions about MediaStore." 2019-03-25 19:06:33 +00:00
TreeHugger Robot
c1bb6ae5b2 Merge "Fix no vibration when typing from time to time" 2019-03-25 18:31:52 +00:00
TreeHugger Robot
b0ee8019bd Merge "Add updated battery saver mode strings" 2019-03-25 18:09:18 +00:00
TreeHugger Robot
61dd061a0a Merge "Do not reset per package appop modes for permissions" 2019-03-25 17:59:36 +00:00
TreeHugger Robot
c4dc4d154c Merge "Fix testTokenBasedResetPassword." 2019-03-25 17:59:28 +00:00
TreeHugger Robot
fb48f85e2a Merge "Fix camera stress tests directory" 2019-03-25 17:52:10 +00:00
Badhri Jagan Sridharan
c6479fd8f4 Merge changes from topic "128534822"
* changes:
  UsbPortManager: Re-enable contaminant detection when port is unplugged
  Support contaminant detection disable workflow
  Refactor actions that are needed to be taken during port status changes.
  Add option to "Enable USB"
2019-03-25 17:17:18 +00:00
Tadashi G. Takaoka
fc394d1a35 [automerger skipped] Merge "Make SelectTest append selectTest argument from extended class" am: 96cf453355 am: bf2309beae
am: b7d958b944 -s ours
am skip reason: change_id I83d13d9ef82a92677bee67da5ee8a5faa0690f82 with SHA1 9648d4b04b is in history

Change-Id: I6d32e3b22535b84fa63e2536587d4d7667c5b99c
2019-03-25 10:13:01 -07:00
Tadashi G. Takaoka
b7d958b944 Merge "Make SelectTest append selectTest argument from extended class" am: 96cf453355
am: bf2309beae

Change-Id: I068d7b920796ac90f756bfcba6cf51e046ebbff3
2019-03-25 10:03:35 -07:00
Winson Chung
30115c998c Merge changes from topic "nav-bar-mode-fw-overlay"
* changes:
  Overlaying the nav bar frame dimens
  Check the overlay state for updating sysui
  Removing old resources
  Remove the swipe up setting from system
2019-03-25 16:58:11 +00:00
Josh Tsuji
a6feeb3afb Merge "Ensure that removing/removed views can't affect chained animations." 2019-03-25 16:56:27 +00:00
Tadashi G. Takaoka
bf2309beae Merge "Make SelectTest append selectTest argument from extended class"
am: 96cf453355

Change-Id: I875035648d138f2fbae86ebc1c0f04c8c8dfaa82
2019-03-25 09:52:49 -07:00
TreeHugger Robot
4ae5f6e35a Merge "Deprecate is_layer for vulkan functor" 2019-03-25 16:42:42 +00:00
Treehugger Robot
96cf453355 Merge "Make SelectTest append selectTest argument from extended class" 2019-03-25 16:38:20 +00:00
Lucas Dupin
49f040258d Merge "Simplify the AttentionService API" 2019-03-25 16:36:27 +00:00
Julia Reynolds
c7dcdc2b2f Allow allowed adjustments
It's not the key, it's the signal key

Test: atest
Bug: 127825514
Change-Id: I550fbbde71747c1f875c11e5c07fb09a65a31bab
2019-03-25 12:33:37 -04:00
Zimuzo
a3bb67d1ed Add ExplicitHealthCheckService API
The ExplicitHealthCheckService implementation will live in ExtServices
so it can be updated outside of a platform update. It will contain
logic to assist the PackageWatchdog with observing packages, e.g
ensuring that the device can successfully connect to WiFi after a
mainline update.

Test: Builds
Bug: 120598832
Change-Id: If658567ca41bb0328e279735897fc50ab76abc11
2019-03-25 16:25:30 +00:00
TreeHugger Robot
c4ef64285d Merge "Make adjustNotification working no matter the notification is just enqueued or already posted" 2019-03-25 16:13:10 +00:00
Christine Franks
ac976f3089 Merge "Synchronize NightDisplayListener" 2019-03-25 16:12:16 +00:00
Stanislav Zholnin
052518f825 Merge "Add READ_DEVICE_CONFIG permission check to DeviceConfig API." 2019-03-25 15:59:02 +00:00
Ryan Mitchell
95d2c302d5 Merge "Compile all files in res/xml as xml" 2019-03-25 15:49:14 +00:00
Salvador Martinez
cc2be1ecfb Merge "Add a generic 'confirm' string for battery saver" 2019-03-25 15:45:46 +00:00
Pavel Grafov
42904c1571 Fix testTokenBasedResetPassword.
Bug: 120536847
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Change-Id: Idbd89cf62121cfd08c7509f175bcece984080854
2019-03-25 15:41:29 +00:00
madym
e35870529b Merge "Add to sysui owners" am: e9e5017afe am: 5a5ec0b4e8
am: f87b17a481

Change-Id: I53a3610950c7a0b91a8b8ada7ceb14b85ea61b5e
2019-03-25 08:19:32 -07:00
madym
f87b17a481 Merge "Add to sysui owners" am: e9e5017afe
am: 5a5ec0b4e8

Change-Id: Ie573d2218aa63d1c6529c4cda98dabfeb64baba5
2019-03-25 08:09:13 -07:00
TreeHugger Robot
2fccf773fb Merge "Add count to TouchEventReported atom" 2019-03-25 15:02:11 +00:00
madym
5a5ec0b4e8 Merge "Add to sysui owners"
am: e9e5017afe

Change-Id: Idf2bf55ce705756cd98f21396a21fc0c3b207bf0
2019-03-25 07:57:46 -07:00
Treehugger Robot
e9e5017afe Merge "Add to sysui owners" 2019-03-25 14:43:37 +00:00
Jeff Sharkey
cc26906c60 More apps making assumptions about MediaStore.
Bug: 126374406
Test: none
Change-Id: Id9d88a4f179bedfea340fbfc738642e52beb99cf
2019-03-25 08:33:43 -06:00
TreeHugger Robot
13fa465291 Merge "Make SelectTest append selectTest argument from extended class" 2019-03-25 14:18:12 +00:00
Christine Franks
97cba33f2d Merge "Split global saturation into a dedicated helper" 2019-03-25 14:11:44 +00:00
Ricky Wai
a0cb13f71a Merge "Suppress injected launcher activity for apps without any permissions or any components" 2019-03-25 14:10:22 +00:00
Andrei-Valentin Onea
ed37f17a3b Merge changes from topic "android-internal-srcs"
* changes:
  Add @UnsupportedAppUsage annotations
  Add android internal dirs to hiddenapi-mappings
2019-03-25 13:57:20 +00:00
Android Build Merger (Role)
273033ea73 Merge "Merge "Add nullability annotations" am: a1ee1fc888 am: 3d48153a8f am: b141a800ac" 2019-03-25 13:57:12 +00:00
Remi NGUYEN VAN
525878a4be Merge "Add nullability annotations" am: a1ee1fc888 am: 3d48153a8f
am: b141a800ac

Change-Id: I43088399da1d81556ab903ef1ca716439129f00d
2019-03-25 06:56:43 -07:00
Roshan Pius
01f9b47101 Merge "Revert "WifiConfiguration: Add a new temp blacklist reason for disconnect"" 2019-03-25 13:56:27 +00:00
Tony Mak
dcef8e393b Make adjustNotification working no matter the notification is just
enqueued or already posted

BUG: 129042820

Test: atest frameworks/base/packages/ExtServices/tests/src/android/ext/services/notification/

Change-Id: I5df96b0e971e9b037b3efa9204c3fad3bfcf1081
2019-03-25 13:47:29 +00:00
Mark Chien
cddc41318e Merge "[TCPKeepalive] Fill correct TOS and TTL value" am: 6aef2afd4e am: 37dd29a169
am: 71f6e5b794

Change-Id: I80c56a14a0be2e6b7996f2bcb9a1a320f0c2c058
2019-03-25 06:44:17 -07:00
Remi NGUYEN VAN
b141a800ac Merge "Add nullability annotations" am: a1ee1fc888
am: 3d48153a8f

Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125
2019-03-25 06:42:49 -07:00
Mark Chien
71f6e5b794 Merge "[TCPKeepalive] Fill correct TOS and TTL value" am: 6aef2afd4e
am: 37dd29a169

Change-Id: I0de6ff4a97f64b0ba72856c9d9d6fe57d677e5fa
2019-03-25 06:34:45 -07:00
Bo Liu
d336f5d95f Deprecate is_layer for vulkan functor
Webview no longer needs this.

Bug: 124123583
Test: comppiles and vulkan webview in layer keeps working
Change-Id: Ib54e33649eb027a03184c5d7588cfd9568c90a6c
2019-03-25 09:34:27 -04:00
Remi NGUYEN VAN
3d48153a8f Merge "Add nullability annotations"
am: a1ee1fc888

Change-Id: I47ec92d406b16eaff049ad4a5af1b1b407418e4d
2019-03-25 06:33:40 -07:00
Mark Chien
37dd29a169 Merge "[TCPKeepalive] Fill correct TOS and TTL value"
am: 6aef2afd4e

Change-Id: I8c5993aadd1bfa79290821215f6dae2bba057c5f
2019-03-25 06:25:42 -07:00
Treehugger Robot
a1ee1fc888 Merge "Add nullability annotations" 2019-03-25 13:19:19 +00:00
Tadashi G. Takaoka
172b7a7e01 Make SelectTest append selectTest argument from extended class
This CL also moves CoreTestsFilter to frameworks/base/tests/utils, so
that FrameworksCoreTests, FrameworksServicesTests, and WmTests can use
CoreTestsFilter.

Test: Pass SelectTestTests
  $ atest WmTests:com.android.test.filters.SelectTestTests
Test: Pass all 85 WM related non-flaky presubmit tests in FrameworksCoreTests
  using CoreTestsFilter
  $ tradefed.sh run commandAndExit FrameworksCoreTests \
      --instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
      --instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 293 WM related non-flaky presubmit tests in
  FrameworksServicesTests using CoreTestsFilter
  $ tradefed.sh run commandAndExit FrameworksServicesTests \
      --instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
      --instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest
Bug: 122451194
Change-Id: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
Merged-In: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
2019-03-25 22:18:34 +09:00
Mark Chien
6aef2afd4e Merge "[TCPKeepalive] Fill correct TOS and TTL value" 2019-03-25 13:10:17 +00:00