Commit Graph

5824 Commits

Author SHA1 Message Date
Junyu Lai
864ead76b1 Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585 am: cb53e78f56
am: 3c6bc9b14d

Change-Id: I1ac85ac863026ea99117c5b0115bcc0c9144fb7b
2019-01-04 08:47:41 -08:00
Junyu Lai
3c6bc9b14d Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585
am: cb53e78f56

Change-Id: I0f289ce46462f494adb99628bd504cafb584eeeb
2019-01-04 08:30:44 -08:00
Junyu Lai
bd73798585 Merge "Ignore ipv6 tx traffic on clat uid." 2019-01-04 09:29:10 +00:00
Richard Uhler
9b86c73c45 Merge changes from topic "rollback_systemapi"
* changes:
  Add test for multi-package rollback.
  Fix bug where RollbackManagerService ignores package name.
  Add test for user data rollback.
  Move rollback manager implementation to RollbackManagerServiceImpl
  Don't expose RollbackManagerService's internal Handler.
  Make RollbackManager @SystemApi.
2019-01-04 09:02:21 +00:00
Richard Uhler
de7907a505 Add test for multi-package rollback.
The test is marked @Ignore for now because we don't yet properly support
rollback of multi-package installs.

Test: atest RollbackTest (with selinux disabled).
Test: atest RollbackTest fails without the @Ignore.
Bug: 112431924

Change-Id: Ia76d48756bc1078344dcf1f2c5696ab79eb0c40c
2019-01-03 09:16:54 +00:00
Richard Uhler
04e84e0ee9 Fix bug where RollbackManagerService ignores package name.
RollbackManagerService incorrectly ignores the package name passed to
getAvailableRollback and executeRollback.

This CL fixes the bug and adds a regression test. The infrastructure for
having multiple test apps in RollbackTest will also be useful for
testing rollback of multi-package installs.

Test: atest RollbackTest (with selinux disabled)
Bug: 112431924

Change-Id: I84c8fdeb97aba557a1f8fd2e71a2bb0d87b10636
2019-01-03 09:16:44 +00:00
Richard Uhler
1f67242cd9 Add test for user data rollback.
The test is currently marked @Ignore because we haven't implemented
support for user data rollback yet.

Test: atest RollbackTest (selinux disabled)
Test: atest RollbackTest fails without the @Ignore.
Bug: 112431924
Change-Id: I3f7906001c932969bdf2125d198f379bf35a99fb
2019-01-03 09:14:52 +00:00
Dan Sandler
787d064df5 Add the current platform easter egg to the picker
It turns out to be very useful when debugging ActivityView.

Test: this is the test
Change-Id: I97274f28be2e83dd92f9bcb4e87efb099cc0cedc
2019-01-02 16:37:38 +00:00
Richard Uhler
c739c8c3f9 Make RollbackManager @SystemApi.
Require callers hold a new MANAGE_ROLLBACKS permission to interact with
the RollbackManager.

Bug: 112431924
Test: atest RollbackTest, with new test for permissions added,
      and with selinux in permissive mode.
Test: atest CtsPermission2TestCases:PermissionPolicyTest
Change-Id: I73f4f3457d85be580670cd69c89066d2cc348186
2019-01-02 09:19:45 +00:00
Richard Uhler
b29f145505 Add RollbackManagerService
This change adds RollbackManagerService as a new system service for
managing apk level rollbacks.

To work properly this requires additional selinux policy changes. Fails
gracefully in case of selinux denials, until we have a chance to sort
out the proper selinux policy.

Bug: 112431924
Bug: 116512606
Test: atest RollbackTest, with selinux enforcement off.
Test: atest CtsPermission2TestCases:PermissionPolicyTest
Change-Id: Id72aae9c4d8da9aaab3922ec9233ba335bc0198f
2018-12-31 12:38:07 +00:00
Garfield Tan
90b042819f Move orientation request into hierarchy.
This CL also removes a hidden method in IWindowManager that's only used
inside of WM right now.

Also wire up Task level logic.

Bug: 113252523
Test: Manual test that app requested orientation still rotates the
display and WmTests.
Change-Id: I7c5046e9beaea79de4ec471eabc792e3593583a2
2018-12-20 13:39:00 -08:00
Jason Monk
9424af7315 Add support for dagger injection with fragments
Convert NavigationBarFragment as a proof of concept and remove all
references to Dependency from NavigationBarFragment.

Test: atest SystemUITests
Change-Id: I0cdb5bc6ac455fce91e67b9e449cb7b78b1da9a4
2018-12-19 16:07:46 -05:00
Remi NGUYEN VAN
90c5bfe077 Merge "Replace InterfaceParams with ifName in DhcpServer" am: 9d5e00321f am: fce422d811
am: 5f5bbffb14

Change-Id: Ib41a931d97610ddeac60012560554c6642186b78
2018-12-17 21:06:01 -08:00
Remi NGUYEN VAN
5f5bbffb14 Merge "Replace InterfaceParams with ifName in DhcpServer" am: 9d5e00321f
am: fce422d811

Change-Id: Iaf8dd7a21156aba248d33d095c169c0f62d8eebe
2018-12-17 20:33:36 -08:00
Remi NGUYEN VAN
9d5e00321f Merge "Replace InterfaceParams with ifName in DhcpServer" 2018-12-18 03:38:24 +00:00
Remi NGUYEN VAN
155da48519 Replace InterfaceParams with ifName in DhcpServer
The current code only uses InterfaceParams#name, and InterfaceParams is
defined in services/net which DhcpServer cannot depend on once moved to
a separate app.

Test: atest FrameworksNetTests
Bug: b/112869080
Change-Id: I94c7dce33200c111666a9dddde82ac2e66a6794f
2018-12-17 15:15:16 +09:00
Adrian Roos
19cc34233c Merge "KeyguardDisableHandler: make properly user aware" 2018-12-14 18:42:56 +00:00
Aaron Huang
e1a4bdb362 Merge "apf: Drop ARP reply if SPA is 0.0.0.0" am: b11a084ebc am: 2c02d789b7
am: 70badb2b3e

Change-Id: I7bb93495865286313e8052d44b54828fff82f244
2018-12-13 19:28:28 -08:00
Aaron Huang
70badb2b3e Merge "apf: Drop ARP reply if SPA is 0.0.0.0" am: b11a084ebc
am: 2c02d789b7

Change-Id: I173fe764a1452066553f4376138a6ff768f7e3dd
2018-12-13 19:19:12 -08:00
Aaron Huang
b11a084ebc Merge "apf: Drop ARP reply if SPA is 0.0.0.0" 2018-12-14 03:00:21 +00:00
Mark Chien
cadc75a3cb Merge "Track default upstream when system is ready" am: d9eeba6fd1 am: 8e4f9929e7
am: 25e0a60024

Change-Id: I72c041051f3bd1735a438f8ce7ded83cf26136f9
2018-12-13 15:35:04 -08:00
Sahin Caliskan
02278c9c53 Merge "Move RCS APIs to android.telephony.ims" am: 4929a0d782
am: 7c7dc29e8d

Change-Id: I2301681cd38c2d364c9e3a5bf94adb400065418c
2018-12-13 15:29:00 -08:00
TreeHugger Robot
26b28799ab Merge "AM: Report launch state with activity launch info" 2018-12-13 23:27:39 +00:00
Mark Chien
25e0a60024 Merge "Track default upstream when system is ready" am: d9eeba6fd1
am: 8e4f9929e7

Change-Id: I36d2eb778603ea68cca43bfe9103b25ab8bb4d37
2018-12-13 14:42:04 -08:00
Sahin Caliskan
4929a0d782 Merge "Move RCS APIs to android.telephony.ims" 2018-12-13 20:48:34 +00:00
Aaron Huang
751ad46524 Merge "Add an APF unit test to drop all packets in the pcap file" am: 0d9b942292 am: 986597923a
am: 9410251786

Change-Id: Iedafc2ea20722060300ec892c32de64fb9dcb6db
2018-12-13 11:14:13 -08:00
Vishnu Nair
bb9ab4b914 AM: Report launch state with activity launch info
Bug: 119988524
Test: atest ActivityMetricsLoggerTests
Test: adb shell am start -W ...

Change-Id: I1d323e84d725722a198a60c51884dba897ec253f
2018-12-13 10:29:46 -08:00
Sahin Caliskan
7719db2b16 Move RCS APIs to android.telephony.ims
This is due to being compatible with other RCS related changes by by other engineers.
Test: Existing tests pass

Bug: 109759350
Change-Id: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
Merged-In: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
2018-12-13 16:50:28 +00:00
Sahin Caliskan
a37ca569b0 Merge "Move RCS APIs to android.telephony.ims" 2018-12-13 16:30:20 +00:00
Alan Stokes
809ada2840 Merge "Separate job service for dynamic code logging." 2018-12-13 15:28:37 +00:00
Mark Chien
d9eeba6fd1 Merge "Track default upstream when system is ready" 2018-12-13 13:28:08 +00:00
markchien
a6c7287f41 Track default upstream when system is ready
Start tracking default upstream from boot.This is useful for
entitlement refine in following change. EntitlementManager can
decide if it needs to process entitlement provisioning before
tethering started.

Test: -atest FrameworksNetTests
      -build, flash, booted
      -manually turnoff/on tethering with different upstream
bug: 111490073

Change-Id: I8fdbd64c52f26b5363693bb5bd8050930e8ea961
2018-12-13 19:01:51 +08:00
Alan Stokes
be9ec976c5 Separate job service for dynamic code logging.
Decouple logging of dynamic code loading from background DEX
optimisation/reconciliation (BackgroundDexOptService).

Add DynamicCodeLoggingService to run DCL logging daily while idle and
charging.

Update DexLoggerIntegrationTests to use the new job, and to verify
that we now handle unknown class loaders.

Bug: 111336847
Test: atest -p services/core/java/com/android/server/pm/dex
Change-Id: Id688a7eef5976120be12606e726830ce32451a1e
2018-12-13 10:30:02 +00:00
Aaron Huang
9410251786 Merge "Add an APF unit test to drop all packets in the pcap file" am: 0d9b942292
am: 986597923a

Change-Id: I5c4e39f01621f41421a1159d7af3c670c001aa7a
2018-12-12 22:27:16 -08:00
Aaron Huang
0d9b942292 Merge "Add an APF unit test to drop all packets in the pcap file" 2018-12-13 03:05:56 +00:00
Hui Yu
b8f2dff7c6 Merge "UsageStats tracking of screen usage." 2018-12-12 20:51:00 +00:00
Hui Yu
03d1240ef3 UsageStats tracking of screen usage.
1. Add UsageStats Event types:
ACTIVITY_RESUMED is synonym to existing MOVE_TO_FOREGROUND.
ACTIVITY_PAUSED is synonym to existing MOVE_TO_BACKGROUND.
ACTIVITY_STOPPED when an activity becomes invisible on the UI.
2. In UsageStats.java, add API getLastTimeVisible() to report last time the
app is visible (ACTIVITY_RESUMED or ACTIVITY_PAUSED), add API getTotalTimeVisible()
to report total time the app is visible.
The existing API getLastTimeUsed() can report last time the app is in
foreground (AKA have focus).
The existing API getTotalTimeInForeground() can report total time the
app is in foreground (AKA have focus).
3. UsageStats.getTotalTimeVisible() can report screen usage for
split-screen mode and picture-in-picture mode.
4. Because in the same package, activity can be instantiated multiple times,
In UsageEvents.Event class, add a member mInstaceId for activity's
instance ID, add interface getInstanceId() to retrieve the instance ID.

Bug: 112002260
Test: frameworks/base/services/tests/servicestests/src/com/android/server/usage/UsageStatsDatabaseTest.java
atest frameworks/base/core/tests/coretests/src/android/app/usage/UsageStatsTest.java

Change-Id: Ibcef2488e9620804c9f9220b027f976e8fa0c98b
2018-12-12 10:07:14 -08:00
Sahin Caliskan
84dd3061d9 Move RCS APIs to android.telephony.ims
This is due to being compatible with other RCS related changes by breadley@

Reviwed in aosp/840289, CP'ed here due to merge conflict.

Test: Existing tests pass

Bug: 109759350
Change-Id: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
2018-12-12 16:05:06 +00:00
Etan Cohen
3c2a2034e4 Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480 am: e603fe8bc0
am: d548b6e050

Change-Id: I0a81b7b48bb02da202dd7feaa1440801b794ce67
2018-12-11 22:22:36 -08:00
Etan Cohen
d548b6e050 Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480
am: e603fe8bc0

Change-Id: I54556ea99992fbc0105bc2012c3d423e88c60764
2018-12-11 22:09:54 -08:00
Etan Cohen
bd648ce246 [CM] Fix comments, add tests to TransportInfo API
Bug: 117605977
Test: atest NetworkCapabilitiesTest
Change-Id: I734ec56e44cd09d11ae81a856a53a26e1191b9a0
2018-12-11 15:00:10 -08:00
Hui Yu
af4fcdcb91 Merge "Add manifest service attribute foregroundServiceType" 2018-12-10 18:59:49 +00:00
Aaron Huang
04ed6a3592 apf: Drop ARP reply if SPA is 0.0.0.0
Some network re-writing packet from broadcast MACs to unicast,
result in this kind of packets cannot be dropped by APF filter.
Thus, drop ARP reply if source IP is 0.0.0.0.

Note: Linux kernel always ignores such replies in the function arp_process().

Bug: 118044271
Test: runtest frameworks-net -c android.net.apf.ApfTest
Change-Id: Id293bf231913d9b483ce7d8dd909e05fa927ccd7
2018-12-10 14:18:14 +00:00
Aaron Huang
785e5f1f96 Add an APF unit test to drop all packets in the pcap file
Read a pcap file and runs it through APF filter, then checks whether all
packets in the file are dropped.

Test: runtest frameworks-net -c android.net.apf.ApfTest
Change-Id: I7fc59864608762cd2bc84131817183846b0bf5b5
2018-12-10 21:05:14 +08:00
Junyu Lai
71c9bea9a8 Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 0882543a12 am: 9867b60f39
am: c92749ad72

Change-Id: I29c57276424464afd54e184c369d30a5e9707f14
2018-12-10 03:10:15 -08:00
Luke Huang
e405415a62 Merge "Migrate INetd to stable aidl" am: 9677dde14a am: ef6b675a8c
am: c2126e2008

Change-Id: I9866b431cd5ddeb318e164fc2a897537a3a7a88d
2018-12-10 03:00:58 -08:00
Lorenzo Colitti
80b8ce887c Merge "Increase the IpClientTest timeouts to reduce flake rate." am: 4e780bd992 am: db3380c87f
am: 95872aa3d1

Change-Id: I645c9fa2b0c9ab234c19a47c9dd09bf132bbe06b
2018-12-10 02:45:27 -08:00
Etan Cohen
4bbe8cc1af Merge "[CS] Add a generic transport-specific information API" am: 7f50b11c89 am: 14062aa659
am: 79cee813c9

Change-Id: I47e0a7d62434b05d4692f9835af93c3a5dd61027
2018-12-10 02:39:46 -08:00
junyulai
f6ebf4ae08 Ignore ipv6 tx traffic on clat uid.
Currently, 464xlat counts its ipv6 tx traffic into root uid.
When user is making ipv4 upload over ipv6-only network, ipv4
tx traffic may sometimes be counted faster then ipv6 tx
traffic.

Thus, NetworkStatsService may detect non-monotonic values due
to 464xlat adjustment.

So the solution is that: for clatd, make ipv6 tx traffic counts
into clat uid, and then ignore it in the framework side.

Bug: 118602783
Test: 1. manually verify clatd traffic on clat uid.
      2. runtest frameworks-net

Change-Id: Ifb478b79e3e281918c70e16d1f90682c78f33db1
2018-12-10 15:19:03 +08:00
Junyu Lai
c92749ad72 Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 0882543a12
am: 9867b60f39

Change-Id: Icfe86f71f9416dcd5fcc9aafd8c346197cde7cff
2018-12-09 21:46:07 -08:00