Commit Graph

4463 Commits

Author SHA1 Message Date
Kirill Grouchnikov
647432a16a Merge "Tweak test app makefile with extra resources" 2017-08-08 13:50:35 +00:00
Hugo Benichi
3100ac7351 Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b am: a22fbf4534 am: db554dfdfa am: 86e04cb370
am: a9527ecb86

Change-Id: I5337d332d52912983b48707a7b419366c3301741
2017-08-08 07:59:12 +00:00
Hugo Benichi
a9527ecb86 Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b am: a22fbf4534 am: db554dfdfa
am: 86e04cb370

Change-Id: I6366148e3da573aa95e5b8e3016eab55e56efe23
2017-08-08 07:53:41 +00:00
Hugo Benichi
86e04cb370 Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b am: a22fbf4534
am: db554dfdfa

Change-Id: I68339b6b5efab5ac8fe72bbbd7c96da59bc24b2e
2017-08-08 07:46:56 +00:00
Hugo Benichi
db554dfdfa Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b
am: a22fbf4534

Change-Id: I64895a50baca163588ce863f7fb93fad31d7f55b
2017-08-08 07:40:02 +00:00
Hugo Benichi
a22fbf4534 Merge "Connectivity OWNERS: let owners modify Android.mk"
am: 05be68698b

Change-Id: Iff94ca7089c074cc44f8e09cbce01f741c0b5c67
2017-08-08 07:34:39 +00:00
Hugo Benichi
05be68698b Merge "Connectivity OWNERS: let owners modify Android.mk" 2017-08-08 07:20:07 +00:00
Hugo Benichi
afd2346bcc Connectivity OWNERS: let owners modify Android.mk
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.

This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.

Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
2017-08-08 10:46:57 +09:00
Hugo Benichi
b2cdd9ee30 Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e am: 8dfb91df6c am: 722c71ed8b
am: edea5c8266

Change-Id: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2
2017-08-05 01:40:48 +00:00
Hugo Benichi
edea5c8266 Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e am: 8dfb91df6c
am: 722c71ed8b

Change-Id: I12636c6699ff60487a28570208e819ea0b66fa2e
2017-08-05 01:28:01 +00:00
Hugo Benichi
722c71ed8b Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e
am: 8dfb91df6c

Change-Id: I533ef8fe369cec19d283ff2950314fce6e28cffd
2017-08-05 01:14:30 +00:00
Hugo Benichi
8dfb91df6c Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240
am: f6346af47e

Change-Id: Ieccad46fcffcaf748f5644b04617e9a82527000e
2017-08-05 01:01:04 +00:00
Hugo Benichi
f6346af47e Merge "NetworkCapabilities: fix describeImmutableDifferences"
am: 7575ec2240

Change-Id: If38efacdeec8476880835657938e435f9b598525
2017-08-05 00:54:43 +00:00
Hugo Benichi
99e8ab6e46 Fix some broken tests in frameworks-net with native dependencies
Exempt-From-Owner-Approval: Android.mk uses per-file permission to let
the build team modify it without dependeing on us. However because this
rule overrides the directory default owners, Android core networking is
not owner anymore. This exemption is necessary to let Android core
networking team fix their build file.

Test: All tests in runtest frameworks-net pass.
Change-Id: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
2017-08-04 07:19:05 +00:00
Hugo Benichi
2ecb9408f4 NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.

Bug: 63326103
Test: added unit tests, runtest frameworks-net
Change-Id: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
2017-08-04 15:17:40 +09:00
Alexandru-Andrei Rotaru
5469504e6b Notify the user and turn off tethering when the service is disallowed.
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering.  Added notification
about
tethering being turned off. Also added Unit Tests to test the
functionality
of the UserRestrictionListener added.

Bug: 27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.

Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
(cherry picked from commit fa6d5c5ca0)
2017-08-03 13:51:36 +00:00
Treehugger Robot
5027dd1026 Merge "Notify the user and turn off tethering when the service is disallowed." 2017-08-03 10:29:55 +00:00
TreeHugger Robot
be09d8d39b Merge "Notify the user and turn off tethering when the service is disallowed." 2017-08-02 09:13:31 +00:00
Kirill Grouchnikov
061e49a6b8 Tweak test app makefile with extra resources
Test: mmma frameworks/base/tests/UiBench
Bug: 30240339
Change-Id: I25cf770d1c74a6741a41bc148b513d9cd0940b5c
2017-08-01 09:35:13 -04:00
TreeHugger Robot
d140c09d56 Merge "Introduce new InflatingEmojiListActivity for JankTest." 2017-08-01 03:48:09 +00:00
Lucas Dupin
bba6a4c9df Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am: f98facc3b8
am: 58d7a76e8d

Change-Id: Ie155db391504fc788036c2a9defae375b6a0b510
2017-07-29 23:24:29 +00:00
Lucas Dupin
835f5e41de Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: I4c4eb814d8ea2152644665daf6fbd6eb28d81b06
2017-07-29 23:17:49 +00:00
Lucas Dupin
58d7a76e8d Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: Iab836083f7e3ea86263de1a1d2a2d69d7e25fe73
2017-07-29 23:17:49 +00:00
Seigo Nonaka
47bc948efe Introduce new InflatingEmojiListActivity for JankTest.
Bug: N/A
Test: ran testInflatingEmojiListViewFling
Change-Id: Ia46db9ce0ee500907e68d374d5b4a6f22e7b708b
2017-07-28 13:23:33 -07:00
Lucas Dupin
9324aa926a Scrim opacity must satisfy GAR
Change-Id: Ic0a2423d73f0a3439a0dc4de8eb6e4719dbf36e1
Fixes: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java
2017-07-28 10:07:04 -07:00
Hugo Benichi
b704e7aa75 Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev
am: a03bf7acd1

Change-Id: I4ca3dcc293be5408a6f207e1ac1a7229a915723a
2017-07-28 04:39:14 +00:00
Hugo Benichi
3cff783a05 NetworkNotificationManager: correctly handle existing notifications
This patch corrects a regression added by commit fb2609d3ee that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.

Contrary to the situation before commit fb2609d3ee, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.

Bug: 63676954
Bug: 62503737
Test: runtest frameworks-net, added new unit tests
Merged-In: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
Merged-In: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6
Merged-In: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf
Merged-In: I73cc879e910d503946facdba498b300337f349fd
Merged-In: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9
Merged-In: I0aa590170f1bd4c37175c7e35e54d52f1fb21347

(cherry picked from commit 5fcd050e0e)

Change-Id: I41675768ab59e9b23ca4275edf297b82595e5730
2017-07-28 09:17:20 +09:00
Hugo Benichi
2b3e495224 Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156 am: ef7d6d93c3 am: 5cbf7e2dc8
am: 1609fe7fe3

Change-Id: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9
2017-07-27 15:08:19 +00:00
Hugo Benichi
1609fe7fe3 Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156 am: ef7d6d93c3
am: 5cbf7e2dc8

Change-Id: I73cc879e910d503946facdba498b300337f349fd
2017-07-27 14:58:32 +00:00
Hugo Benichi
5cbf7e2dc8 Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156
am: ef7d6d93c3

Change-Id: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf
2017-07-27 14:50:14 +00:00
Hugo Benichi
ef7d6d93c3 Merge "NetworkNotificationManager: correctly handle existing notifications"
am: 3451fb6156

Change-Id: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6
2017-07-27 14:43:48 +00:00
Treehugger Robot
3451fb6156 Merge "NetworkNotificationManager: correctly handle existing notifications" 2017-07-27 14:36:47 +00:00
Hugo Benichi
5fcd050e0e NetworkNotificationManager: correctly handle existing notifications
This patch corrects a regression added by commit fb2609d3ee that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.

Contrary to the situation before commit fb2609d3ee, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.

Bug: 63676954
Bug: 62503737
Test: runtest frameworks-net, added new unit tests
Change-Id: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
2017-07-27 21:20:20 +09:00
Narayan Kamath
ad72d319ba Merge "Remove CoreTests: HeapTest" am: c3fd3b8c7d am: 19d39ee384 am: 1cfc324de1
am: 2d82836601

Change-Id: If9a442d49b90a301fe03e3727944f589d02d811a
2017-07-27 12:00:10 +00:00
Narayan Kamath
2d82836601 Merge "Remove CoreTests: HeapTest" am: c3fd3b8c7d am: 19d39ee384
am: 1cfc324de1

Change-Id: I884488795303effda4274978c93e086cee433272
2017-07-27 11:52:36 +00:00
Narayan Kamath
1cfc324de1 Merge "Remove CoreTests: HeapTest" am: c3fd3b8c7d
am: 19d39ee384

Change-Id: I7ac73bf032ea640bc65c5c85df75330133255052
2017-07-27 11:45:08 +00:00
Narayan Kamath
19d39ee384 Merge "Remove CoreTests: HeapTest"
am: c3fd3b8c7d

Change-Id: If6565f8bc8a655d3d7422f57db3dd6160459b092
2017-07-27 11:37:02 +00:00
Narayan Kamath
c3fd3b8c7d Merge "Remove CoreTests: HeapTest" 2017-07-27 11:26:10 +00:00
Lucas Gomez Jimenez
b3787b9ce7 Remove CoreTests: HeapTest
It is largely redundant due to other tests in art/ and libcore/

Test: Run CoreTests

Change-Id: I97485c522fed157d650b95225ad6641e4184d7bf
2017-07-26 13:31:08 +02:00
Lucas Dupin
58f6bf9f59 Merge "resolve merge conflicts of a1f64b0a91 to oc-mr1-dev" into oc-mr1-dev
am: fb4da9ea55

Change-Id: I48c1900df0400b4b1897cbf126a0a4539ab60f2b
2017-07-25 22:29:37 +00:00
Lucas Dupin
ef15776aaf resolve merge conflicts of a1f64b0a91 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3
2017-07-25 12:00:01 -07:00
Lucas Dupin
667c29d0be Merge "Fix jank when switching themes" into oc-dr1-dev
am: a1f64b0a91

Change-Id: I60c1b404b4b3a673cd3bf44f36deed546965f9cc
2017-07-25 17:47:47 +00:00
Hugo Benichi
2b691d874f Merge "Bootstrap IpReachabilityMonitor unit tests" am: a9889c94aa am: 39a707813b am: 5bc28905b6
am: 9b88e173c7

Change-Id: I060c17bf421771dd09305696344cb77a4382b46e
2017-07-25 14:51:40 +00:00
Hugo Benichi
9b88e173c7 Merge "Bootstrap IpReachabilityMonitor unit tests" am: a9889c94aa am: 39a707813b
am: 5bc28905b6

Change-Id: I9ca394ccac1683d5d91b426582cfb3cddb5f5e96
2017-07-25 14:45:35 +00:00
Hugo Benichi
5bc28905b6 Merge "Bootstrap IpReachabilityMonitor unit tests" am: a9889c94aa
am: 39a707813b

Change-Id: Ie56377ae158d32a3592fd700e93fc827754ecaa3
2017-07-25 14:39:40 +00:00
Hugo Benichi
39a707813b Merge "Bootstrap IpReachabilityMonitor unit tests"
am: a9889c94aa

Change-Id: Ic3b145159a4c0430cc248a19b8527af40fa67696
2017-07-25 14:33:45 +00:00
Hugo Benichi
06b1f2b173 Bootstrap IpReachabilityMonitor unit tests
Bug: 62918393
Test: runtest frameworks-net

Change-Id: I236029f460dc3631ef9f5d8312dc1c6faf9807df
2017-07-25 14:59:48 +09:00
Lucas Dupin
e17ce5286f Fix jank when switching themes
Turning overlays on and off takes time,
it also doesn't allow us to have fine control
over which view is using which theme.
Lock screen colors are now driven by themes.

Change-Id: Ie8860d00dbb0705ed76edf60a9d3030618dd21ca
Fixes: 63751714
Test: Visual. Set wallpapers, unlock.
Test: runtest -x packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
Test: systrace
2017-07-24 13:26:22 -07:00
Jorim Jaggi
e5e7ea281f Revert "Fix jank when switching themes" am: 6498f96283
am: 51a1525199

Change-Id: I06187734d198eff410f1b04d2c7c2e491e57e709
2017-07-24 14:23:10 +00:00
Jorim Jaggi
7f58322d51 Revert "Fix jank when switching themes"
am: 6498f96283

Change-Id: Ie5813f1c04a6db9d5ee291df764873900add5064
2017-07-24 14:14:34 +00:00