Commit Graph

305072 Commits

Author SHA1 Message Date
TreeHugger Robot
22a7c7ddf2 Merge "Allow showing content on virtual displays when locked" 2017-01-27 13:07:58 +00:00
Lorenzo Colitti
c850137cf5 Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203 am: 8fea8e5bbd am: c620e64f61
am: 5bad599e2e

Change-Id: I3a16ff459b8f702249f14e9becbb2630ce7471fd
2017-01-27 10:04:15 +00:00
Lorenzo Colitti
9e3f050973 Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am: be80577f5b am: 0c659d2065 am: f8cff961c8
am: 420ad9748a

Change-Id: Iebafbf438ee4efcd53b3e6d5c71b34c0ca4e2c6b
2017-01-27 10:00:14 +00:00
Lorenzo Colitti
5bad599e2e Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203 am: 8fea8e5bbd
am: c620e64f61

Change-Id: Iaa1ab50a323133cadfa4f39440fce982cde8d1fe
2017-01-27 10:00:06 +00:00
Lorenzo Colitti
c620e64f61 Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203
am: 8fea8e5bbd

Change-Id: I66f2c2174c2895224724245c1b3d815da1678955
2017-01-27 09:55:39 +00:00
Lorenzo Colitti
420ad9748a Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am: be80577f5b am: 0c659d2065
am: f8cff961c8

Change-Id: I1d3707b4bc2ae00ca0fad1c3ec7e6ca859fcdd16
2017-01-27 09:55:36 +00:00
Lorenzo Colitti
f8cff961c8 Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am: be80577f5b
am: 0c659d2065

Change-Id: I7fbf2cb2c9778f5c961335c5b9fd5a138ec140db
2017-01-27 09:51:39 +00:00
Lorenzo Colitti
8fea8e5bbd Merge "ConnectivityServiceTest: fix flaky tests"
am: b8bbd30203

Change-Id: I0577f6b48de8a95e7d12e58a672fb0374ced9403
2017-01-27 09:51:32 +00:00
Lorenzo Colitti
0c659d2065 Merge "ConnectivityServiceTest: remove flaky waitForIdle test."
am: be80577f5b

Change-Id: I444746af6adc7be4a3f69243379f65aadf29ea19
2017-01-27 09:47:05 +00:00
Lorenzo Colitti
b8bbd30203 Merge "ConnectivityServiceTest: fix flaky tests" 2017-01-27 09:40:47 +00:00
Lorenzo Colitti
be80577f5b Merge "ConnectivityServiceTest: remove flaky waitForIdle test." 2017-01-27 09:38:52 +00:00
TreeHugger Robot
d49708225a Merge "Ensure settings provider joins the rescue party" 2017-01-27 09:04:32 +00:00
Andrii Kulian
fc8f82bc6b Allow showing content on virtual displays when locked
This adds new flag to virtual display that changes its
behavior when keyguard is shown, but can be dismissed without
entering credentials. This can be applied only to private
virtual displays.

Bug: 34280365
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testVirtualDisplayHidesContentWhenLocked
Test: #testShowWhenLockedVirtualDisplay
Test: #testShowWhenLockedPublicVirtualDisplay
Change-Id: I9c19d36295e62f59bd1db1352af707d54ea51667
2017-01-27 00:14:06 -08:00
Lorenzo Colitti
298c878209 Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master am: 277bd4235e am: 22cd53384c
am: 13df9a8f3b

Change-Id: I21e82ec985335ed9aed78b3fc5dcb005d1ab025b
2017-01-27 07:48:01 +00:00
Hugo Benichi
f4accaa02d Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp am: 6a688ca1ad -s ours
am: b7050f527e

Change-Id: Iaaba0c8dd7181a5560158c47e817d31c25d8dbf6
2017-01-27 07:43:06 +00:00
Stephen Chen
0287d4635c Merge commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus-aosp am: 7bc2aebd53
am: 90de4acf20

Change-Id: I318efe59e1967150338a7bd8001c27d9ebe3cf75
2017-01-27 07:42:07 +00:00
Hugo Benichi
10112a5678 Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp am: 53095bb5bd -s ours
am: 6917374fde

Change-Id: I7028ef23f597e6e82ecdb6c11a6c8dcdb1d1f77b
2017-01-27 07:40:56 +00:00
Lorenzo Colitti
13df9a8f3b Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master am: 277bd4235e
am: 22cd53384c

Change-Id: I03bdbb9fc8ceb6a7180b93c29b1d63b4fd471820
2017-01-27 07:37:02 +00:00
Hugo Benichi
b7050f527e Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
am: 6a688ca1ad  -s ours

Change-Id: Icf4cf5e8e95b9de4b313f826a40c1df81c02aa8a
2017-01-27 07:29:59 +00:00
Stephen Chen
90de4acf20 Merge commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus-aosp
am: 7bc2aebd53

Change-Id: I3de8f91b1c9d0160ec58be8347502769580e0159
2017-01-27 07:29:07 +00:00
Hugo Benichi
6917374fde Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
am: 53095bb5bd  -s ours

Change-Id: Ie2f8c1e18acf57238fe4816812562ecd1644cf51
2017-01-27 07:28:06 +00:00
Lorenzo Colitti
22cd53384c Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master
am: 277bd4235e

Change-Id: I02efb8229026eb6ddfbf10bf72645dea10a4215f
2017-01-27 07:26:28 +00:00
Svetoslav Ganov
5fb405ba60 Ensure settings provider joins the rescue party
The settings provider has logic to incrementally reset state
in an effort to recover from pushing a bad value putting the
system in a bad state. The settings provider was not force
persisting its state after a reset so after the reboot we
lost the reset changes. Also while resetting we were also
resetting the package name leading to a promotion of the reset
value to being set by the system. Updated the tests and while at
this added logic to synchronously persist critical settings
such as device provisioned.

Test: All tests pass. Manually tested end-to-end rescue party

bug:34677175

Change-Id: Ib240072df2fa549dae39c301008adf48cdf1573a
2017-01-26 23:24:25 -08:00
The Android Automerger
6a688ca1ad Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
* commit '88932754ffdcbffb3cb43e03991e5eb598c10458':
  Captive portals: login activity probes like NetworkMonitor
  Logging improvements in CaptivePortalLoginActivity
  Captive portal systel log improvements
  Fix flaky IpPrefixTest.
  Removing bogus file added by mistake
  frameworks-test: adding missing @SmallTest
  Netd events: record connect() success/errno
  Add missing dependency.
  Show notification for always-on app VPN
2017-01-27 06:39:52 +00:00
The Android Automerger
7bc2aebd53 Merge commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus-aosp
* commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec':
  Implement metered tracking for NetworkStats summary queries.
2017-01-27 06:39:41 +00:00
The Android Automerger
53095bb5bd Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
* commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1': (35 commits)
  NetworkMonitor: send one DNS probe per web probe
  NetworkMonitor metrics: add first validation information
  APF: also drop any ICMPv6 RSs
  ConnectivityServiceTest: fix testAvoidBadWifiSettings
  Fix ConnectivityServiceTest testRequestBenchmark
  Switch over to new "time.android.com" NTP pool.
  Define API for metering network stats buckets.
  Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
  Use @Ignore to explicitly disable a @Test method.
  Fixed NetworkStatsServiceTest and converted it to JUnit4.
  VPN network stat accounting changes.
  ConnectivityThread: use lazy holder idiom
  ConnectivityManager: use ConnectivityThread looper
  ConnectivityManager: a simpler CallbackHandler
  Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
  Add a null check for the OnStartTetheringCallback.
  TokenBucket for rate-limiting and throttling
  IpConnectivityMetrics reads buffer size in settings
  CaptivePortalLogin: set mixed content policy to compatibility.
  Add IP conn metrics to dumpsys and bug reports
  ...
2017-01-27 06:39:05 +00:00
TreeHugger Robot
e852d6731b Merge "Fix issues with launching activities on virtual displays" 2017-01-27 05:44:37 +00:00
TreeHugger Robot
e682445698 Merge changes from topic 'session_refactoring'
* changes:
  Adds autofill save ui
  Moar AutoFill Framework refactoring...
2017-01-27 03:46:36 +00:00
Andrii Kulian
4acfd858a4 Fix issues with launching activities on virtual displays
- Virtual displays might have hdr capabilities not initialized,
  which lead to exception when checking.
- Dynamic stacks were mistakenly considered an invalid launch stack.

Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I20356d6e25cf9e5fa4a3d7bd3699a8e82a73f21a
2017-01-26 19:43:13 -08:00
Doris Liu
6ba5ed322c Use listener to determine whether an Animator has ended
BUG: 34736819
Test: ran cts test for ValueAnimator and AnimatorSet
Change-Id: Ia1070f83833940cb09d26243f5873751d9ca2a38
2017-01-26 19:23:22 -08:00
TreeHugger Robot
11c80cf32b Merge "Lifecycle guarantees for target fragments" 2017-01-27 02:45:17 +00:00
TreeHugger Robot
903f98e37f Merge "Expose Java side for parenting SurfaceControl" 2017-01-27 02:43:52 +00:00
Phil Weaver
53b50cb051 Merge "Remove unused symbols for a11y." 2017-01-27 02:28:58 +00:00
TreeHugger Robot
cee9bb91c6 Merge "Change the theme to light for help activity." 2017-01-27 02:14:19 +00:00
Felipe Leme
87af2d8596 Adds autofill save ui
Test: Manual verification of save ui
Test: CtsAutoFillServiceTestCases passes

BUG: 31001899
Change-Id: Ibb154fc6108f20e6a1b889549bd264e8b80f2f0c
2017-01-26 18:07:16 -08:00
TreeHugger Robot
18c9dc53d2 Merge "StrictMode detectAll() based on target API level." 2017-01-27 01:41:35 +00:00
TreeHugger Robot
416903e7c4 Merge "Unhide ApplicationInfo.volumeUuid." 2017-01-27 01:34:40 +00:00
TreeHugger Robot
8dc7ccc6e1 Merge "Push mapping from file extension to GID." 2017-01-27 01:03:11 +00:00
Adam Powell
ab209a63a2 Lifecycle guarantees for target fragments
Ported from frameworks/support change id
I824eb312fbdfd6b548fe94aa2cd5b03afbaa97c7

When a target fragment was set using Fragment#setTargetFragment, all
bets were off, especially when restoring from instance state. Order of
lifecyle initialization was undefined meaning that two bugs could
occur, both of which manifested as the target fragment was not
initialized by the time the referring fragment's onCreate ran. One
could happen if the target fragment is on the back stack, the other
could happen if the target fragment was ordered unfortunately in
FragmentManager implementation details. (!)

Fix both by guaranteeing that any target fragment gets pushed forward
to at least the CREATED state before we dispatch any lifecycle events
for the referring fragment.

Add some sanity checks that try to keep developers from setting target
fragments across different FragmentManagers or from creating target
cycles, both of which are bad ideas.

Bug: 33653458
Test: CTS FragmentLifecycleTest
Change-Id: If624d4665d29e205d37b9b384322e64d6d6d3615
2017-01-27 00:52:26 +00:00
Android Build Merger (Role)
051e90ad84 Merge "Merge "Add a flag to enable/disable the diskstats logging service." into nyc-mr2-dev am: 56d29925ac am: 4726ee4435" 2017-01-27 00:51:20 +00:00
Daniel Nishi
0c388e04ee Merge "Add a flag to enable/disable the diskstats logging service." into nyc-mr2-dev am: 56d29925ac
am: 4726ee4435

Change-Id: Ib8a6e37e37a73f61eee28a3a656c349af327c230
2017-01-27 00:50:27 +00:00
Android Build Merger (Role)
766f462763 Merge "Add a flag to enable/disable the diskstats logging service. am: 88e45dcd1f am: 2297fd2946" 2017-01-27 00:50:06 +00:00
Daniel Nishi
6321bdce18 Add a flag to enable/disable the diskstats logging service. am: 88e45dcd1f
am: 2297fd2946

Change-Id: I15391057ae632e36f05231a1d188dd01c1e5da90
2017-01-27 00:49:10 +00:00
Makoto Onuki
2c631ab46d Merge "Cache isManagedProfile()." 2017-01-27 00:49:09 +00:00
Bill Yi
6c250a7268 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6470caa2e2 -s ours
am: fe6ad95cdc  -s ours

Change-Id: I2c05e5319cefd6da5433273e040a667aa161cafa
2017-01-27 00:44:21 +00:00
Bill Yi
1ab96bb622 Import translations. DO NOT MERGE am: 951b1616fc -s ours
am: ffc4f0e83c  -s ours

Change-Id: I0607c22635ee2f90b368777562c407cfa58bb796
2017-01-27 00:43:20 +00:00
Daniel Nishi
4726ee4435 Merge "Add a flag to enable/disable the diskstats logging service." into nyc-mr2-dev
am: 56d29925ac

Change-Id: Ibb4ae749d9eaa0cc10f2ebb721c2b94fa13cac38
2017-01-27 00:43:02 +00:00
Daniel Nishi
2297fd2946 Add a flag to enable/disable the diskstats logging service.
am: 88e45dcd1f

Change-Id: Ie822eea68dc0a02c8fad1a838ff9bf23f738106f
2017-01-27 00:42:54 +00:00
Phil Weaver
5e51a57df5 Remove unused symbols for a11y.
Bug: 34738635
Test: These are unused. Verifying the build seems sufficient.
Change-Id: I5bbb97780b1b994871e8c13b1ef58a8a958fa99b
2017-01-26 16:38:36 -08:00
Bill Yi
fe6ad95cdc Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 6470caa2e2  -s ours

Change-Id: I6cea2b032629810b13efba6e2efb18ba2e1e7b0f
2017-01-27 00:38:24 +00:00