Commit Graph

3124 Commits

Author SHA1 Message Date
Erik Kline
413d00c1c0 Merge "Add explicit override for default Private DNS mode" into pi-dev
am: 2b3c858296

Change-Id: If480ab40c7cf9ab75c52feafc28338a049cbceef
2018-05-18 01:08:26 -07:00
TreeHugger Robot
2b3c858296 Merge "Add explicit override for default Private DNS mode" into pi-dev 2018-05-18 07:59:58 +00:00
Remi NGUYEN VAN
f6509edebb resolve merge conflicts of f121c090c2 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie9aab5e1d786f32d219a66dd7184a9209c684eeb
2018-05-18 14:24:09 +09:00
Remi NGUYEN VAN
f121c090c2 Merge changes Ieb0a5d24,I44df6668
am: 646dfc7703

Change-Id: Icb2a3df0de05012e3627807a5bf710b43de9b111
2018-05-17 20:40:35 -07:00
Remi NGUYEN VAN
646dfc7703 Merge changes Ieb0a5d24,I44df6668
* changes:
  Fix SntpClientTest failures with no active network
  Allow specifying a network for SNTP time sync
2018-05-18 01:44:44 +00:00
Annie Meng
c9fd5be45f Merge "Fix NPE in ComponentNameValidator" into pi-dev
am: b105913098

Change-Id: I9725217151634a66d7cd3dc0e80acb5f78f15c39
2018-05-17 11:34:33 -07:00
Annie Meng
b105913098 Merge "Fix NPE in ComponentNameValidator" into pi-dev 2018-05-17 18:20:29 +00:00
Annie Meng
5d26b8c03a Fix NPE in ComponentNameValidator
In general, we should consider null component names as invalid settings,
meaning that we don't restore.

b/79925290 to allow restoring null component names for specific
settings where null has semantic meaning.

Bug: 79910479
Test: 1) atest SettingsValidatorsTest
2) Manual:
- In Settings UI, select "None" for autofill service and accessibility
shortcut target
- "adb backup -keyvalue -f nullsettings.ab com.android.providers.settings"
- "adb restore nullsettings.ab" and verify no crashes
Change-Id: Iffecbe7d26a93a816e7be42f564ba471f9681876
2018-05-17 17:56:58 +00:00
Erik Kline
1984179409 Add explicit override for default Private DNS mode
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 79719289
Change-Id: I943c5476666e47d04690626e2133f501cb875b46
2018-05-17 17:41:12 +09:00
Remi NGUYEN VAN
6657d42602 Fix SntpClientTest failures with no active network
The last change is using getActiveNetwork to run the queries, which
results in an NPE if there is no network on the device. Using network 0
causes no socket tagging and allows queries to the local test SNTP
server to go through as previously.

Also migrating to JUnit4 and moving mServer and mClient initializers to
setUp().

Test: SntpClientTest now passes
Change-Id: Ieb0a5d247129bcad89c1add0e9c1c504f516e2a9
2018-05-17 10:25:05 +09: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
1d9a9610ae Merge "Disable AAPT2 for modules that use missing features"
am: 87dc8d6576

Change-Id: I0b745f8f9bd0af7eaa4a395a7f024b981f4193c3
2018-05-16 14:05:09 -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
Kurt Marcinkiewicz
7a4ff6447d Allow specifying a network for SNTP time sync
Permits syncing over a specific network instead of the default for
the process. This was causing an issue with Android Wear devices
paired with iOS where the default network is bluetooth
(see b/32663274).

This CL is in support of ag/3776564

Bug: 32663274

Test: adb shell am instrument -e class android.net.SntpClientTest -w \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
(cherry-pick of pi-dev Ic9fc169cf75457810d4992121d85d7642e350b90)
Merged-In: I339c77063c72a9d76a5c4cb17052e20fb6e045a6
Merged-In: I8dfd1cad99c63efdc14c174c19f094a61cdfc44f

Change-Id: I44df66688292b144ec7dfcdd9ae5d82489f82774
2018-05-16 16:43:43 +09:00
Dan Willemsen
d00c851e55 Merge "Convert to Soong" am: acbd94d76f
am: b1005a8a2a

Change-Id: If5cb26e0669f79240d8fee1d40aaa2162d8e611f
2018-05-15 15:06:19 -07:00
Dan Willemsen
b1005a8a2a Merge "Convert to Soong"
am: acbd94d76f

Change-Id: Ib04e6936303b53cf4d919ad07a27a9b8dda86168
2018-05-15 15:00:18 -07:00
Damien Bargiacchi
3a3982a09c Merge "Switch the setting for Off Body Radios Off to User Absent Radios Off" into pi-dev
am: 76fd7d5776

Change-Id: Ia3360c6431fd9e8273150e7fba52e3922bc2095d
2018-05-15 14:19:25 -07:00
Damien Bargiacchi
76fd7d5776 Merge "Switch the setting for Off Body Radios Off to User Absent Radios Off" into pi-dev 2018-05-15 20:58:31 +00: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
Abodunrinwa Toki
164183125c Merge "Do not parcel legacy TextClassification fields" into pi-dev
am: 6db14d01c2

Change-Id: I8e26ed6f5dceaea509ea8d43c2088018ba4aac8e
2018-05-13 14:44:11 -07:00
TreeHugger Robot
6db14d01c2 Merge "Do not parcel legacy TextClassification fields" into pi-dev 2018-05-13 21:32:20 +00:00
Beverly Tai
647907274f Merge "Show settings suggestion" into pi-dev
am: 1b69d7b406

Change-Id: I844f26a32f1c72ed605946d690154fa1f3141a0a
2018-05-11 14:09:30 -07:00
Beverly
301e92a4dd Show settings suggestion
Bug: 78445134
Test: Settings tests
Change-Id: Ib66ebb3af3328ac1ffa9949282afaf800e1f1019
2018-05-11 09:45:04 -04:00
Yifan Hong
2ca3f24830 Merge "VintfObjectTest: fix test with respect to deprecation schedule changes" into pi-dev
am: 34d5ae5e74

Change-Id: I65f6bd930af0df7fe6af0f050dbe7f0784ce00f1
2018-05-10 13:10:15 -07:00
TreeHugger Robot
34d5ae5e74 Merge "VintfObjectTest: fix test with respect to deprecation schedule changes" into pi-dev 2018-05-10 19:58:00 +00:00
Abodunrinwa Toki
ba196c5a3d Do not parcel legacy TextClassification fields
If we depend on legacyIntent, then TextClassifierService implementations
will have to always popuplate a deprecated field.
To avoid breaking legacy clients, the returned legacyOnClickListener should
represent the first pendingIntent (i.e. primary action) that was parcelled.

Bug: 78340399
Test: atest CtsViewTestCases:TextClassificationManagerTest
Test: atest FrameworksCoreTests:TextClassificationTest
Test: manual check with a TCS that only sets non-deprecated fields vs a
legacy TC client
Change-Id: I41d27a65f1ede6369dd2a66d92b2210edb0d11e2
2018-05-10 19:42:55 +01:00
Dianne Hackborn
74dc457242 Merge "Further flesh out app ops foreground state." into pi-dev
am: 7105e2ca9a

Change-Id: I3a8056b6685ad7687ff5d54748c242eb9c906343
2018-05-09 22:59:34 -07:00
Damien Bargiacchi
68bbaade77 Switch the setting for Off Body Radios Off to User Absent Radios Off
Bug: 79491395
Change-Id: I82f8742398da503bdddc420399de444e3314998e
2018-05-09 21:11:44 -07:00
Remi NGUYEN VAN
f0e3b091f8 Merge "Fix android.net.SSLTest" am: ef43ea3238
am: 60b828ca86

Change-Id: I482bd9734f62ba1554e0d7e0bf889b23450303ee
2018-05-09 19:31:38 -07:00
Remi NGUYEN VAN
60b828ca86 Merge "Fix android.net.SSLTest"
am: ef43ea3238

Change-Id: If877193c05bf6b932aceacc93b27241e619a21b2
2018-05-09 18:35:47 -07:00
Dianne Hackborn
65a4f251c7 Further flesh out app ops foreground state.
Fix some bugs, add the ability to monitor state changes, improve
dumpsys output to help debugging, add a new check API that allows
the caller to get the real state.

Bug: 78480444
Test: atest FrameworksServicesTests:AppOpsServiceTest
Test: atest CtsPermissionTestCases:AppOpsTest
Change-Id: I3d41be9968c1d95a1456f4052da958ea64aa068d
2018-05-09 18:02:35 -07:00
Remi NGUYEN VAN
ef43ea3238 Merge "Fix android.net.SSLTest" 2018-05-10 00:11:21 +00:00
Victor Hsieh
5c195ee292 Merge "Allow only selected priv apps to run OOB" into pi-dev
am: 792d36c170

Change-Id: Iad80a321e1b76f19935a23290594a36fd057840c
2018-05-09 12:37:38 -07:00
Victor Hsieh
792d36c170 Merge "Allow only selected priv apps to run OOB" into pi-dev 2018-05-09 19:21:22 +00:00
Victor Hsieh
785d618b1a Allow only selected priv apps to run OOB
- Add pm.dexopt.priv-apps-oob-list to allow selecting specific packages
  to run OOB, in a comma-separated string of package names. When set to
  "ALL" (default), all priv apps will run in OOB.
- Add a global config priv_app_oob_list to persist the state for
  experiment.
- Also make background dexopt to respect the config.

Test: 0. Reset previous OOB settings.
      1. settings put global priv_app_oob_list \
         com.google.android.gms,com.android.vending
      2. cmd package compile -m speed -f com.google.android.gms (then
         com.android.vending, com.google.android.googlequicksearchbox)
      3. dumpsys package dexopt
         # .vending and .gms are "verify", .googlequicksearchbox is
         # "speed".
Test: settings put global priv_app_oob_list 'ALL'  # see the same result
Test: settings delete global priv_app_oob_list  # see the same result
Test: atest SettingsBackupTest
Bug: 30972906
Bug: 63920015
Change-Id: Iba47b4763a026cdc94939db0a743822278917269
2018-05-09 07:45:51 -07:00
Yifan Hong
ff5e95b111 VintfObjectTest: fix test with respect to deprecation schedule changes
Test: atest -bit android.os.VintfObjectTest
Change-Id: I819f99884a8bf8d71b3ae21bdd1508fe9c3e4a7a
Fixes: 79393534
2018-05-08 18:30:43 -07:00
Rohan Shah
566a00935e Merge "Add knobs for tweaking blocking helper thresholds" into pi-dev
am: 7af8fe3e29

Change-Id: I5a5307d2345bb4ab5d3e91f3b58eaf8fc875f1ef
2018-05-08 14:17:35 -07:00
Rohan Shah
7af8fe3e29 Merge "Add knobs for tweaking blocking helper thresholds" into pi-dev 2018-05-08 21:00:07 +00:00
Rohan Shah
0350dab5b6 Add knobs for tweaking blocking helper thresholds
Added both blocking helper parameters to Global Settings to allow for
tweaking stats/values. Added listeners for value updates (so that
channels are updated properly with new thresholds).

Bug: 77143005
Test: manually, test cases
Change-Id: Ia5cfb29ca40500a694261bd5e9e60fa1f34e742a
2018-05-08 09:34:38 -07:00
Remi NGUYEN VAN
81774d1fa5 Fix android.net.SSLTest
The test is failing because of lack of visibility (IllegalAccessError).
Also rename it to match the tested class, migrate to JUnit4, and remove
an old test that is unused (suppressed), relies on third-party servers
and is not a proper unit test (would try to make real network requests).

Test: test now passes
Change-Id: I5032a056df83d4f572d89860b52bd85a1993d9dc
2018-05-08 15:31:58 +09:00
Remi NGUYEN VAN
44e953f177 Merge "Fix testUidPoliciesToString" am: c8613f9965
am: 717f4e19d8

Change-Id: Ic61bf635c929f3e3e14bb913eba238cd53e955a6
2018-05-07 22:32:14 -07:00
Remi NGUYEN VAN
717f4e19d8 Merge "Fix testUidPoliciesToString"
am: c8613f9965

Change-Id: I3ec2fd01ca55ef63d0bfe0cec48854f852c736cc
2018-05-07 22:24:56 -07:00
android-build-team Robot
2629cb09ea Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev
am: 564942d065

Change-Id: I4fa6433b1e0fa320568c0b8c5ed5f2ce5c93314b
2018-05-04 16:53:04 -07:00
android-build-team Robot
564942d065 Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev 2018-05-04 23:40:22 +00:00
Andrii Kulian
8dab13567a Merge "Preserve custom activity intent on relaunch" into pi-dev
am: 1b59867b9f

Change-Id: I7fa71c11e25e08d65b9e0a4e8349b934d6bf9cb1
2018-05-03 11:41:45 -07:00
Andrii Kulian
1b59867b9f Merge "Preserve custom activity intent on relaunch" into pi-dev 2018-05-03 18:26:04 +00:00
android-build-team Robot
63180005bb Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev
am: 0d58b9bb64

Change-Id: I158c05e9bd15f9dda46bbcb09a313d7932d72c02
2018-05-03 07:06:35 -07:00
Andrii Kulian
770c403069 Preserve custom activity intent on relaunch
An activity can have a custom intent set via Activity#setIntent().
This was lost in ag/3305584

Change-Id: I88f3e164d2cf7f6c62989bba05cd84b9b83befc3
Fixes: 73181785
Test: ActivityThreadTest#testCustomIntentPreservedOnRelaunch
2018-05-02 18:40:59 -07:00
Adrian Roos
786ea783ea BackgroundFallback: Cover all cases where the fallback is needed
Fixes an issue where uncovered regions were not
covered if they are to the right or bottom of the
content view.

Fixes: 78661186
Test: Install test app from bug, enable cuotut, open test app, go to landscape, verify white fallback background is drawn in both landscape and seascape
Test: atest BackgroundFallbackTest
Change-Id: I442f03395a71550a534d64233762aa84002319dd
2018-05-02 12:58:54 +00:00
Remi NGUYEN VAN
e025d4deaa Fix testUidPoliciesToString
The test is likely failing since go/ag/1344349 because of a bad
copy-paste between patchsets 6 and 7.

Test: test now passes
Change-Id: I87341c4f4db1e7b61c3899368b24ea484fe8bfd1
2018-05-02 17:34:12 +09:00