Commit Graph

5361 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
df6464d890 Merge "Fix testRegisterUsageCallback" am: d0b9f983d6 am: 66674ce8fb
am: 6b8e9a0635

Change-Id: I2a64dcaa10cd4f26e6508be9bad1d4ecc1dc3d12
2018-05-08 02:24:48 -07:00
Remi NGUYEN VAN
6b8e9a0635 Merge "Fix testRegisterUsageCallback" am: d0b9f983d6
am: 66674ce8fb

Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
2018-05-08 02:13:00 -07:00
Remi NGUYEN VAN
d0b9f983d6 Merge "Fix testRegisterUsageCallback" 2018-05-08 07:55:42 +00:00
Kirill Grouchnikov
ce93a98e4f convert Uibench test to aapt2
Bug: NA
Test: build
Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
Merged-In: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
(cherry picked from commit bffef1f024)
2018-05-03 16:38:17 -07:00
Gopinath Elanchezhian
3b5f321008 Merge "Add 'ss' trace category in app launch test." into pi-dev
am: 0b96d863c6

Change-Id: I5a140a7372c64687c3073405ef2c41d38f61dc03
2018-05-02 11:39:07 -07:00
Gopinath Elanchezhian
0b96d863c6 Merge "Add 'ss' trace category in app launch test." into pi-dev 2018-05-02 18:24:30 +00:00
Remi NGUYEN VAN
14178014fc Fix testRegisterUsageCallback
noteOp (introduced in go/ag/3897834) checks that the calling uid matches
the calling package, which is not correct when using a fake calling
package. Use the real package of the test so permissions are checked
properly.

The test currently only fails this way in pi-dev as noteOp is only used
in pi-dev.
Change-Id: I9ac3717af9335ba9efa0b8842a2df0d7b69ec9ab
Test: Fixed test now passes in pi-dev
Bug: b/78487385
2018-05-02 16:51:13 +09:00
android-build-prod (mdb)
6f26ca27c8 Merge changes from topic "am-b4a6d70f84a44081adc7240053891656" into pi-dev-plus-aosp
am: 5e5a150dbd

Change-Id: Ice5d3c6c975c0945785332c09a876754441d536d
2018-05-01 20:11:28 -07:00
android-build-prod (mdb)
0e3748ab44 Merge changes from topic "ifaceStats" am: 90c01b0093
am: b86d2b4b84

Change-Id: I460bc25806182bc2dc5fcc2512ab01e776a0e8e6
2018-05-01 19:53:30 -07:00
Chenbo Feng
b815c978b8 Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.

Bug: 72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
2018-05-01 14:13:55 -07:00
Tyler Gunn
b02996cb14 Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev am: 7f556daa41
am: d6aef2176f

Change-Id: Id4b1f204061f6c7f6c12c2faa392015ade4c4b7f
2018-05-01 13:52:35 -07:00
Tyler Gunn
d6aef2176f Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev
am: 7f556daa41

Change-Id: Icd641707eef832fd5f3d393c64ce9b3483770e9d
2018-05-01 13:41:49 -07:00
Tyler Gunn
7f556daa41 Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev 2018-05-01 20:27:15 +00:00
gopinath
86900d817f Add 'ss' trace category in app launch test.
Bug: b/78898738

Test: atest google/perf/app-startup/hermetic-apps/cold-dropcache-stable-test -v
Change-Id: Id69edfa6903e077b2434e8474a7034f136aadecb
(cherry picked from commit a6adc07235)
2018-05-01 19:19:01 +00:00
Gopinath Elanchezhian
261d67e3ee Merge "Add 'ss' trace category in app launch test." 2018-05-01 19:18:43 +00:00
gopinath
a6adc07235 Add 'ss' trace category in app launch test.
Bug: b/78898738

Test: atest google/perf/app-startup/hermetic-apps/cold-dropcache-stable-test -v
Change-Id: Id69edfa6903e077b2434e8474a7034f136aadecb
2018-04-30 14:50:09 -07:00
Tyler Gunn
f955e56d51 Require READ_CALL_LOG permission to see phone numbers in phone state.
Incoming and outgoing call phone numbers are visible in the phone state
broadcast and via the PhoneStateListener.  To enhance user privacy, change
to require the READ_CALL_LOG permission in order to receive the call
phone numbers.

This means to see phone numbers:
1. android.intent.action.PHONE_STATE - requires READ_PHONE_STATE and
READ_CALL_LOG permission.
2. PhoneStateListener#onCallStateChanged - now required READ_CALL_LOG
permission.

To support this new behavior, added sendBroadcastAsUserMultiplePermissions
method to context to allow sending the broadcast to all users while
requiring the two permissions.

Bug: 78650469
Test: Created PHONE_STATE broadcast receiver in test app and verified that
when no permissions are granted, the phone number is empty for incoming
and outgoing calls.
Test: Granted Phone state permission to test app and verified that phone
number is not populated.
Test: Granted test app read call log permission and verified that phone
number is populated.
Test: Created PhoneStateListener in test app and verified that when no
permissions are granted, phone number is empty for incoming and outgoing.
calls.
Test: Granted read call log permission to test app and verified that both
the incoming and outgoing numbers are populated.

Change-Id: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
2018-04-27 08:44:07 -07:00
Chalard Jean
f97656b81c Let DnsManager fill in LinkProperties for private DNSes
(clean cherry-pick from ag/3880157)

Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
Merged-In: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
Merged-In: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981
2018-04-27 13:32:10 +09:00
Chalard Jean
03dbf6bd5e Add the list of private DNS addresses to LinkProperties
(clean cherry-pick from ag/3874803)

Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Merged-In: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
Merged-In: I6bdbef78d078d68534c8e07e9af031ce374560ef
2018-04-27 13:32:10 +09:00
Bernie Innocenti
825c739486 apf: Add immediate encoding tests for LI
This tests that ApfGenerator knows how to optimally encode positive and
negative immediates of various sizes.

Equivalent tests will follow for LDDW and STDW.

Change-Id: Ia904aecb155c78569e3cf32a2431570281570481
Bug: 73804303
Test: runtest tests/net/java/android/net/apf/ApfTest.java
(cherry picked from commit 18050000d7)
2018-04-24 21:28:49 +09:00
Chalard Jean
886dee4112 Merge changes I0cd83a93,I03ae2bbb into pi-dev am: 411e79b8b0
am: a4eec2cefa

Change-Id: Ia8f985b448251f911484e6bd63fa562bffc1b0e4
2018-04-24 03:10:25 -07:00
Chalard Jean
a4eec2cefa Merge changes I0cd83a93,I03ae2bbb into pi-dev
am: 411e79b8b0

Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
2018-04-24 03:02:11 -07:00
Chalard Jean
26400490a2 Make sure getActiveNetwork is consistent with default callbacks
Bug: 77737389
Test: runtest framework-net
      new test don't pass without the main code change, but they
      do with it
Change-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091
2018-04-24 17:32:00 +09:00
Chalard Jean
fb0c87e8b4 Add tests for getActiveNetwork.
Bug: 77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da
2018-04-24 15:23:28 +09:00
Chalard Jean
4dec3057d6 Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev am: 2a915264a6
am: a5fc870335

Change-Id: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981
2018-04-23 00:42:24 -07:00
Chalard Jean
a5fc870335 Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev
am: 2a915264a6

Change-Id: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
2018-04-23 00:33:21 -07:00
Chalard Jean
f0f364f2c5 Let DnsManager fill in LinkProperties for private DNSes
Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
2018-04-23 13:58:42 +09:00
Chalard Jean
1df73dd267 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev am: f12a2130a4
am: 1bb54ae872

Change-Id: I6bdbef78d078d68534c8e07e9af031ce374560ef
2018-04-20 04:59:52 -07:00
Chalard Jean
1bb54ae872 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
am: f12a2130a4

Change-Id: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
2018-04-20 04:49:43 -07:00
TreeHugger Robot
580a1ed904 Merge "Adjust APF interpreter tests to match APFv4" into pi-dev 2018-04-20 11:41:52 +00:00
TreeHugger Robot
f12a2130a4 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev 2018-04-20 11:23:56 +00:00
Bernie Innocenti
deb145d233 Adjust APF interpreter tests to match APFv4
Change-Id: I4311c754f1cb79633d49c5c1c0b4e27c8dde727e
Bug: 73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
(cherry picked from commit 545d9367e2)
2018-04-20 17:37:09 +09:00
Chalard Jean
9419b11458 Add the list of private DNS addresses to LinkProperties
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
2018-04-20 16:48:43 +09:00
Bernie Innocenti
684b2c5dc7 Merge "apf: Add immediate encoding tests for LI" am: 9ee5bb0037 am: b0e8ab677b
am: b5d0b5f9b5

Change-Id: I3cf8a3392456b827b06c1b0b3ffaa7fab1331389
2018-04-19 20:32:11 -07:00
Bernie Innocenti
b5d0b5f9b5 Merge "apf: Add immediate encoding tests for LI" am: 9ee5bb0037
am: b0e8ab677b

Change-Id: Ia02de6226d85713037fcd86726fec4a04d5d630a
2018-04-19 20:21:11 -07:00
gopinath
1769e72b43 Merge "Add more trace categories." into pi-dev am: 6d9f7943fb
am: b60c453620

Change-Id: Id8552da026c343728dd9ce5d633bd7f3aae0054c
2018-04-19 20:03:07 -07:00
gopinath
b60c453620 Merge "Add more trace categories." into pi-dev
am: 6d9f7943fb

Change-Id: Ib0817f4a53ab63e895a8a57d33841a362e358fa6
2018-04-19 19:50:52 -07:00
gopinath
21799f8b05 Add more trace categories.
Add tracing for additional filters as well.

Bug : b/78244687, b/78301352

Test: atest hot-nodropcache-stable-test
Change-Id: Ie6fd109b645c92dcfa414e3c41cc5f43032fe6fd
2018-04-20 00:59:12 +00:00
Bernie Innocenti
e09405b710 Merge "Adjust APF interpreter tests to match APFv4" am: 05011abf27 am: e56afce9e9
am: 3bd37ea3c2

Change-Id: If59d48f39b4f8d622ac0f9362e1b3ff45bee1228
2018-04-19 08:34:43 -07:00
Bernie Innocenti
3bd37ea3c2 Merge "Adjust APF interpreter tests to match APFv4" am: 05011abf27
am: e56afce9e9

Change-Id: Iac5a843c1476dd96029956bba7e68aed538d0c52
2018-04-19 08:23:07 -07:00
Bernie Innocenti
18050000d7 apf: Add immediate encoding tests for LI
This tests that ApfGenerator knows how to optimally encode positive and
negative immediates of various sizes.

Equivalent tests will follow for LDDW and STDW.

Change-Id: Ia904aecb155c78569e3cf32a2431570281570481
Bug: 73804303
Test: runtest tests/net/java/android/net/apf/ApfTest.java
2018-04-19 22:55:35 +09:00
Bernie Innocenti
1b144e6dab Merge "Teach ApfGenerator about the new opcodes for accessing data memory" into pi-dev 2018-04-18 11:26:55 +00:00
Bernie Innocenti
545d9367e2 Adjust APF interpreter tests to match APFv4
Change-Id: I4311c754f1cb79633d49c5c1c0b4e27c8dde727e
Bug: 73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
2018-04-17 17:30:41 +09:00
Jeff Sharkey
00f8ad0a11 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev am: 936c0868f8
am: 7b913d70b9

Change-Id: Ifd131fb60996e416f44f7acc68257e4663ef4ba7
2018-04-16 18:43:09 -07:00
Jeff Sharkey
7b913d70b9 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am: 936c0868f8

Change-Id: I3c84c646b3a79f09dc1210e18f48d1f87d38abd4
2018-04-16 17:44:58 -07:00
Jeff Sharkey
6b64925737 Protect usage data with OP_GET_USAGE_STATS.
APIs that return package usage data (such as the new StatsManager)
must ensure that callers hold both the PACKAGE_USAGE_STATS permission
and the OP_GET_USAGE_STATS app-op.

Add noteOp() method that can be called from native code.

Also add missing security checks on command interface.

Bug: 77662908, 78121728
Test: builds, boots
Change-Id: Ie0d51e4baaacd9d7d36ba0c587ec91a870b9df17
2018-04-16 12:44:32 -06:00
Jeff Sharkey
ca4ea18363 Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev am: f78b8ce258
am: 563a57bcf9

Change-Id: I9b5b2fc72188258326cc875457886370cb20e4fd
2018-04-16 10:31:41 -07:00
Jeff Sharkey
563a57bcf9 Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
am: f78b8ce258

Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593
2018-04-16 10:19:39 -07:00
Jeff Sharkey
9415b11aca Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev am: e0fe6df357
am: 0cd9173ad3

Change-Id: I82d0ba458b4caf71bd7bf6719b027bd89767709d
2018-04-16 10:17:37 -07:00
Jeff Sharkey
0cd9173ad3 Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
am: e0fe6df357

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded
2018-04-16 10:07:52 -07:00