Commit Graph

5383 Commits

Author SHA1 Message Date
Colin Cross
ca9dce8eca Merge "Disable AAPT2 for modules that use missing features" am: 87dc8d6576 am: 1d9a9610ae
am: 3667bf4876

Change-Id: Id5dd5513af0a84616e34dd3303561b8dee4c12ad
2018-05-16 14:31:31 -07:00
Colin Cross
3667bf4876 Merge "Disable AAPT2 for modules that use missing features" am: 87dc8d6576
am: 1d9a9610ae

Change-Id: Iba6ee4996c11d66fa7e6f510b0213b2e61f30524
2018-05-16 14:14:27 -07:00
Colin Cross
940b98ee4e Disable AAPT2 for modules that use missing features
Use LOCAL_USE_AAPT2 := false to disable AAPT2 for modules that
use features that are not implemented in AAPT2.

Fixes:
frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:46: error: unexpected element <package> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:82: error: unexpected element <package> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_verifier_bad/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_verifier_good/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
frameworks/base/packages/CtsShim/build/shim/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
frameworks/base/tests/ActivityTests/AndroidManifest.xml:42: error: unexpected element <preferred> found in <manifest><application><activity>.
out/target/common/obj/APPS/CtsShimPriv_intermediates/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
frameworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unexpected element <meta-data> found in <manifest><permission>.
...

Bug: 79755007
Test: m FORCE_AAPT2=true java
Change-Id: I393b697c521ab2a4fbc00b29a43aed6b4729b9a8
2018-05-16 09:34:26 -07:00
Jason Monk
159f13f17e Merge "Merge "Fix testable looper threading" into pi-dev am: 5a36c134b7" into pi-dev-plus-aosp
am: 6a308e1800

Change-Id: I33d57e7867bde221b53f6710d6c984aed58707b6
2018-05-16 08:55:30 -07:00
Jason Monk
7182a22dbb Merge "Fix testable looper threading" into pi-dev
am: 5a36c134b7

Change-Id: I63b58decc71d46ae35351273551174d6fb646dab
2018-05-16 08:29:42 -07:00
Jason Monk
1e352f4c34 Fix testable looper threading
In the case where an annotation was not used and the TestableLooper
was manually created, then the messages would be executed on the wrong
thread.

Also switch some handlers over to async, might save us a little time.

Test: runtest --path frameworks/base/tests/testables
Bug: 79550837
Change-Id: I70a36449ae08eb5799e2dad41a5d258bb51a3fd3
2018-05-16 10:15:33 -04:00
Colin Cross
0f4bf2acbd Merge "Fix errors caught by aapt2" am: 6d78fe0385 am: ef9db6bfb6
am: 3bc01b2082

Change-Id: If646b8963365c3b45344439b01c14b41c6379a4b
2018-05-15 17:34:33 -07:00
Colin Cross
3bc01b2082 Merge "Fix errors caught by aapt2" am: 6d78fe0385
am: ef9db6bfb6

Change-Id: I249627820aabdabc3e0d06c82450efe8830934bc
2018-05-15 17:15:49 -07:00
Dan Willemsen
f97d380ca7 Merge "Convert to Soong" am: acbd94d76f am: b1005a8a2a
am: d00c851e55

Change-Id: I889b5d31535d927b3aa9cf5ad6af955ca0678356
2018-05-15 15:52:51 -07:00
Treehugger Robot
6d78fe0385 Merge "Fix errors caught by aapt2" 2018-05-15 22:21:56 +00:00
Dan Willemsen
d00c851e55 Merge "Convert to Soong" am: acbd94d76f
am: b1005a8a2a

Change-Id: If5cb26e0669f79240d8fee1d40aaa2162d8e611f
2018-05-15 15:06:19 -07:00
Colin Cross
489e9a7424 Fix errors caught by aapt2
Fixes:
frameworks/base/tests/LotsOfApps/AndroidManifest.xml:10: error: attribute 'android:name' in <activity> tag must be a valid Java class name.
frameworks/base/tests/LotsOfApps/AndroidManifest.xml:17: error: attribute 'android:name' in <activity> tag must be a valid Java class name.
frameworks/base/tests/LotsOfApps/AndroidManifest.xml:24: error: attribute 'android:name' in <activity> tag must be a valid Java class name.
...

Bug: 79481102
Test: m java FORCE_AAPT2=true
Change-Id: Ib00f277d251497942ad53f1ba1f8f5e12b2f7ba9
2018-05-14 22:42:30 -07:00
Colin Cross
e88605ca37 Merge "Fix errors caught by aapt2" am: ed90a673d4 am: 592590c3d2
am: ceaf60dc18

Change-Id: I91978ad442e7b79a3c19819cffa322c30cc274c4
2018-05-14 17:36:20 -07:00
Colin Cross
ceaf60dc18 Merge "Fix errors caught by aapt2" am: ed90a673d4
am: 592590c3d2

Change-Id: I47bac881f38d638192418c4e664722cc71941f0d
2018-05-14 17:23:55 -07:00
Dan Willemsen
4888b1f6f0 Convert to Soong
See build/soong/README.md for more information.

Test: m libframeworks_coretests_jni
Test: m FrameworkCoreTests_install
Test: m libshim_jni
Test: m CtsShimPrivUpgrade
Test: m libfilterfw
Test: m PMTest_Java_dual
Test: m libdefcontainer_jni
Test: m libperftestscore_jni
Test: m libpmtest32 libpmtest64
Test: m libprintspooler_jni
Test: m libsmartcamera_jni
Test: m idmap
Test: m libdrmframework_jni
Test: m libdvr_loader com.google.vr.platform com.google.vr.platform.xml
Test: m libfilterpack_imageproc libfilterpack_base
Test: m libwebviewchromium_loader
Test: m shared_mem_test
Test: m test-touchlag
Change-Id: I868561dd237fa28647896d59049ab9260373ada1
2018-05-14 16:47:02 -07:00
Colin Cross
a864902d05 Fix errors caught by aapt2
Fixes:
frameworks/base/tests/ActivityTests/res/values/themes.xml:18: error: resource previously defined here.
frameworks/base/tests/ActivityTests/res/values/themes.xml:21: error: duplicate value for resource 'style/SlowDialog' with config ''.

Bug: 79481102
Test: m java FORCE_AAPT2=true
Change-Id: I06b1552220b5acd8790d72555e36a0466c523b67
2018-05-10 22:16:21 -07:00
mike dooley
82aaf21a54 Merge "Fixing a couple crashes in the SoundTriggerTestApp" into pi-dev am: 67890e0e1d
am: bbea1f436f

Change-Id: I4899434b32a6f2685fdbfe3d25a854917832f25d
2018-05-10 00:23:16 -07:00
mike dooley
bbea1f436f Merge "Fixing a couple crashes in the SoundTriggerTestApp" into pi-dev
am: 67890e0e1d

Change-Id: I834d2a80f9dede5e1d2f3be73c9d71821c94e2ab
2018-05-10 00:10:06 -07:00
TreeHugger Robot
67890e0e1d Merge "Fixing a couple crashes in the SoundTriggerTestApp" into pi-dev 2018-05-10 06:57:32 +00:00
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
android-build-team Robot
e696cf636d Merge changes from topic "ifaceStatsDetail" into pi-dev
* changes:
  Remove the unused file parsing function
  Use eBPF map data for per iface stats
2018-05-02 19:17:27 +00: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
bbabc51b5b 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
Merged-In: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
(cherry picked from aosp commit b815c978b8)
2018-05-01 19:48:03 -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