Commit Graph

4556 Commits

Author SHA1 Message Date
Automerger Merge Worker
62b841ca94 [DO NOT MERGE] Exclude euicc_unsupported_countries from backup test am: 10097500e6
Change-Id: Iab993a5705ef01cc95d3ebb8956da98e6db99d92
2019-12-20 00:25:28 +00:00
SzuWei Lin
10097500e6 [DO NOT MERGE] Exclude euicc_unsupported_countries from backup test
Bug: 146550929
Test: atest SettingsBackupTest
Change-Id: I48c255a4e8999be903e5642ca6d7b312b214d05f
2019-12-19 22:06:44 +00:00
Automerger Merge Worker
3b05bd784e DO NOT MERGE: Exclude nearby_sharing_component from backup test am: d4af97c549
Change-Id: I7229440f1cf986d6d37731373715a4a536462b4c
2019-12-18 01:53:56 +00:00
Dan Sandler
d4af97c549 DO NOT MERGE: Exclude nearby_sharing_component from backup test
Fixes: 146019461
Test: atest SettingsBackupTest
Change-Id: Ieb953284f2c00d69220e776f2b628f73013140e0
2019-12-18 01:08:13 +00:00
Automerger Merge Worker
58745b4dcc Merge "Expose CloseGuard as a public API" am: 4314616565 am: 37f8e04de9
Change-Id: I42faa5840cb92a7c5c549e41f5cb03660165d9f4
2019-12-12 18:45:43 +00:00
David Su
4314616565 Merge "Expose CloseGuard as a public API" 2019-12-12 18:19:12 +00:00
Automerger Merge Worker
73b581f0dd Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" am: db70de3656
Change-Id: I0a695d10ecca6134e851c0e482af7318de4fdb95
2019-12-11 17:10:03 +00:00
Jian Jin
db70de3656 Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"
This reverts commit ba4b561c3e.

Reason for revert: Move to CarSettings

Change-Id: I91fd1fa7dee2400095a014c189a40706b853c471
2019-12-11 00:35:05 +00:00
Automerger Merge Worker
5e1e8b2756 DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings am: ba4b561c3e
Change-Id: I853bb7f04816151b34e7adcd024d31d971561558
2019-12-10 22:34:47 +00:00
David Su
0c472adb0d Expose CloseGuard as a public API
Wrap dalvik.system.CloseGuard and expose it as a
public API from android.util.

Bug: 145831809
Test: atest CloseGuardTest
Change-Id: Ia44c84a69a5fb693fb8bb1a075c18a60253cedfc
2019-12-10 13:46:24 -08:00
Neil Fuller
746d69afa5 Merge "Extend LocalLog to enable UTC timestamps" am: 9436134056
am: c74594a2e3

Change-Id: I417bf9581e3fbce9921e7893c1e63e6dd9a7b30b
2019-12-10 01:50:39 -08:00
Jian Jin
ba4b561c3e DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings
Bug: 144846684
Test: SettingsProviderTest
Change-Id: Iebc53c70ea401c6ba244ed43db7a1d73f3a894df
2019-12-09 14:07:26 -08:00
Neil Fuller
a7453c69b2 Extend LocalLog to enable UTC timestamps
Extend LocalLog to enable UTC timestamps with elapsed realtime clock
info too.

Switch time-related usages over to using UTC timestamps. This will make
debugging a lot easier when the code doing the logging is responsible
for changing the system clock and default time zone.

Test: treehugger only
Bug: 140712361
Change-Id: Ic6b12f9032c0c3ebc48f12a970a7b4dd398e7fec
2019-12-09 17:02:44 +00:00
Neil Fuller
c186f60e8c Merge "TimeDetector improvements" am: 6e3020490d
am: c72f796176

Change-Id: I76a5726953cd6dc7998e298c9d41e86a3b4f7c00
2019-12-06 04:08:26 -08:00
Neil Fuller
6e3020490d Merge "TimeDetector improvements" 2019-12-06 11:53:14 +00:00
Neil Fuller
57aaf1d427 Merge "Add a manual path for setting time zone" am: 7fcab2dba8
am: 076cd7aa3a

Change-Id: I03abce9eca7c3fa031a4a0b103cb0063ea4bb85b
2019-12-04 07:42:57 -08:00
Treehugger Robot
2b65793cd6 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:02 +00:00
Neil Fuller
076cd7aa3a Merge "Add a manual path for setting time zone"
am: 7fcab2dba8

Change-Id: I4a77a647a01fb5b274a5bf819b1e22d4ec7d8219
2019-12-03 12:28:24 -08:00
Neil Fuller
0db51fc310 TimeDetector improvements
TimeDetector improvements for production code and tests. Many of these
are based on feedback given for TimeZoneDetector and to improve
consistency across the two.

1) Add a builder for PhoneTimeSuggestion, making it immutable (except
for debug info that doesn't affect behavior).
2) Improve debug logging.
3) Improve comments / annotations.

Test: atest android.app.timedetector
Test: atest com.android.server.timedetector
Bug: 140712361
Change-Id: Ibd0d357c536d512ffe4995c4e6560e483a260ae5
2019-12-03 20:22:05 +00:00
Neil Fuller
f807b4c364 Merge "Add a new time zone detection service" am: 7d8a624085
am: 256f4df4b6

Change-Id: Ie1b28c5cea14a23beac2e70eb7878f7f09461d6c
2019-12-03 08:42:57 -08:00
Neil Fuller
2c6d510e45 Add a manual path for setting time zone
Add a mechanism for suggesting the "manual" time zone setting to the
TimeZoneDetectorStrategy, e.g. for the settings app to use. This
involves various changes / renames to TimeZoneDetectorStrategy to
introduce a distinction between 3 things:
1) General detection code, applicable for anything that changes device
time zone.
2) Phone detection code, applicable for setting the device time zone
from phone signals.
3) Automatic detection code, applicable for setting the device time zone
automatically (of which telephony signals is currently the only example,
but could be joined by new things in future).

Adds tests for the new ManualTimeZoneSuggestion and makes improvements
to the existing tests for PhoneTimeZoneSuggestionTest.

Test: atest android.app.timezonedetector
Test: atest com.android.server.timezonedetector
Bug: 140712361
Change-Id: I9c3a18e47b157cccabda74855e5c91b45fa93b92
2019-12-03 16:38:03 +00:00
Neil Fuller
256f4df4b6 Merge "Add a new time zone detection service"
am: 7d8a624085

Change-Id: Ic30cd636b4863a507dda0bdb05e982ee411d936f
2019-12-03 08:30:50 -08:00
Neil Fuller
3352cfce2f Add a new time zone detection service
Add a new time zone detection service. Much of the code is from
frameworks/opt/telephony with some changes for naming, threading and
to modify the interaction with the "Callback" class.

Overall goal:

Implementing the service in the system server means it will be easier to
add new time zone detection logic unrelated to telephony in future.

Bug: 140712361
Test: atest com.android.server.timezonedetector
Test: atest android.app.timezonedetector
Change-Id: I89505fc4fecbd3667b60f8e1479b8f177eaa60ae
Merged-In: I89505fc4fecbd3667b60f8e1479b8f177eaa60ae
(cherry picked from commit 3e3b5405b6)
2019-11-28 13:27:55 +00:00
Tony Mak
64bf5c6221 Merge "Fix a broken test by mocking PackageManager" am: 9301bbf008
am: 47cb8217b1

Change-Id: I14f83f5f0891cc437a04306da1c51aaa0e096713
2019-11-27 12:09:02 -08:00
Tony Mak
47cb8217b1 Merge "Fix a broken test by mocking PackageManager"
am: 9301bbf008

Change-Id: Iae564004657b004c0bb98381bb005a088a5735c9
2019-11-27 12:04:12 -08:00
Tony Mak
fbe852495c Fix a broken test by mocking PackageManager
There is no email app in AOSP, and thus the test fails.
Mocking the package manager output to fix the test

Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java

Fixes: 139536812
Fixes: 145209230
Fixes: 145287677

Change-Id: I86026724c81f9d928eb652f25fc968911f93001b
Merged-In: Ie2dd599528074266d45044b1785a1b7d71caa1d3

Exempt-From-Owner-Approval: Re-enabling test in TEST_MAPPING
for AOSP.
2019-11-27 18:28:06 +00:00
Neil Fuller
4fae9dd7c8 Merge "Allow for empty time suggestions" am: a241a15ccc
am: e02dcaa9d1

Change-Id: I06dd78a0a45df3761c271eb106fc15029989e2bd
2019-11-27 02:11:52 -08:00
Neil Fuller
e02dcaa9d1 Merge "Allow for empty time suggestions"
am: a241a15ccc

Change-Id: Ib6e1ddbba9c474f06475a666d025ab8e0f98189b
2019-11-27 02:04:56 -08:00
Neil Fuller
a241a15ccc Merge "Allow for empty time suggestions" 2019-11-27 09:45:53 +00:00
Dan Sandler
486ad0d659 Action chips in share sheet. (DO NOT MERGE)
am: 0d3e358628

Change-Id: I0df785ea4279811fe4f556f67dde8e3c6cef98b0
2019-11-25 05:28:10 -08:00
Daniel Sandler
3b179167af Merge "Action chips in share sheet. (DO NOT MERGE)" into qt-qpr1-dev 2019-11-25 13:22:19 +00:00
Dan Sandler
0d3e358628 Action chips in share sheet. (DO NOT MERGE)
Move the Copy button to a new row of chips below the
(now larger) preview. Optionally, if a proximity-sharing
service is installed, show that chip as well.

Bug: 143229724
Fixes: 144290152
Test: atest SystemUITests frameworks/base/core/tests/coretests
Change-Id: I0d6457df85bc937f72ca97da6b4b84b634a90daf
2019-11-24 23:39:49 +00:00
David Su
02076c7a01 Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" am: 1124e240c0
am: c4df6668bb

Change-Id: I6e50821d3fdd5e6ff5fc4cd238ccd186dd1ff94c
2019-11-21 11:58:10 -08:00
David Su
c4df6668bb Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID"
am: 1124e240c0

Change-Id: Ia0c92f1db33b0a884da7388cd31b33d51df29288
2019-11-21 11:50:57 -08:00
David Su
e51ae1566b NetworkKey: migrate from ScanResult.wifiSsid to SSID
wifiSsid is an @hide field, migrate to getter method.

Bug: 144311098
Test: atest NetworkKeyTest
Change-Id: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
Merged-In: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
2019-11-20 10:41:59 -08:00
Neil Fuller
568fd897eb Allow for empty time suggestions
Allow for empty time suggestions in the TimeDetectorService. The empty
suggestions are currently ignored but are likely to be used in future
time detector strategy implementations.

Bug: 140712361
Test: atest android.app.timedetector.PhoneTimeSuggestionTest
Test: atest com.android.server.timedetector
Change-Id: Ifb219702fa8bc53665a0d74752e06d851d86f8bb
2019-11-20 16:04:37 +00:00
Alison Cichowlas
3e0f092077 Merge "Restore app pinning." into qt-qpr1-dev
am: 599634a26b

Change-Id: I808d010ea658badb7aaecc4a62074a18ae97f7d0
2019-11-19 16:18:45 -08:00
Alison Cichowlas
a40cd3feb8 Restore app pinning.
Bug: 143229724
Test: atest AbstractResolverComparatorTest; atest ChooserActivityTest
Change-Id: I71d4334c8d3beed94495b41d5264a95cbbd132ff
Merged-In: I71d4334c8d3beed94495b41d5264a95cbbd132ff
2019-11-19 19:16:02 +00:00
Bill Lin
bc687cd1f3 Merge changes from topic "apex_migration" am: 8eacf37ef3
am: 42a049c287

Change-Id: Ic951da75a0b4548fe30f583b5af59b811f6b3db5
2019-11-06 18:40:45 -08:00
Bill Lin
42a049c287 Merge changes from topic "apex_migration"
am: 8eacf37ef3

Change-Id: If897274a7d2b9258142a55a628525821d713af4b
2019-11-06 18:30:09 -08:00
Oli Lan
1138012b54 Clean up generatePackageInfoFromApex() API
This changes the API for generatePackageInfoFromApex in PackageParser
in response to review suggestions made in ag/6701090.

The method is renamed to generatePackageInfo with a PackageParser.Package
parameter (as well as an ApexInfo and flags). The implementation is combined
with the main generatePackageInfo method. Callers are changed to perform
the parsing themselves, including the collection of certificates if
necessary.

Note: the method signature and implementation had already changed since
ag/6701090, so the suggestions from that CL may not apply directly.

Bug: 129261524
Test: atest PackageParserTest
Test: atest CtsStagedInstallHostTestCases

Change-Id: Iee213e025583c2201ff9d65c447e4278b925a2f0
Merged-In: I495539679812110f89d5e3d93f2622ba2dab36c0
(cherry picked from commit c2c7a22333)
2019-11-06 23:15:21 +08:00
Edgar Wang
003ee4342d Merge "Add Tap Gesture for Aware Settings" into qt-qpr1-dev
am: e39c7bd211

Change-Id: I9f640b4c496297084934cb8036e011e675077f0c
2019-11-04 20:13:27 -08:00
Edgar Wang
5af0fd3316 Add Tap Gesture for Aware Settings
- Add new settings provider key for tap gesture.

Bug: 138296598
Test: atest & manual

Change-Id: Icf0073ded0063ba5ed128bd3e3ea7d28a9336715
Merged-In: Ib76327b37a415512145a150a4b0e176a6cb114d7
2019-11-01 00:50:49 +08:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Varun Shah
b53b34487b Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.

Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Merged-In: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
Change-Id: Idaae690f79a5c680ad0059a52be62160d9dfb5e7
(cherry picked from commit 5e67462971)
2019-10-22 22:52:49 +00:00
Neil Fuller
a4783a8a28 Merge "Make TimeDetectorService more aware of origin" am: 4ef2551dfa am: 3150e58082
am: 84c6981a8f

Change-Id: Ica76e3630488a31c42ecd3b654d1a47a453e8bde
2019-10-21 13:08:40 -07:00
Neil Fuller
84c6981a8f Merge "Make TimeDetectorService more aware of origin" am: 4ef2551dfa
am: 3150e58082

Change-Id: Ia70f69e226a7800e82e29dd504351aef65048ed3
2019-10-21 12:04:05 -07:00
Neil Fuller
3150e58082 Merge "Make TimeDetectorService more aware of origin"
am: 4ef2551dfa

Change-Id: I27866cf74b779bb0040f4ace384207047ca6838f
2019-10-21 11:53:20 -07:00
Neil Fuller
af3eeaf431 Make TimeDetectorService more aware of origin
Make TimeDetectorService more aware of a time signal's origin by making
the time signal from telephony less generic.

When TimeDetectorService was written it was assumed that the TimeSignal
could be generic and there would just be a String source identifier to
indicate origin.

With multiple SIMs / phones on a device it makes sense to keep track of
the originating phone of the signal so that the time detector service
could implement stickiness if it wanted. This would avoid a device
alternating back and forth between two signals and help with debugging.

As new signals are added, new "suggestXxxxTime()" methods will be added
to TimeDetectorService. That is the point at which the strategy for
ranking different sources can be decided. e.g. should NTP always rank
higher than NITZ?

The main change here is that TimeSignal is renamed to
PhoneTimeSuggestion to indicate it's only for use by signals from
telephony, sourceId has been removed and it has been given a phoneId
instead. Extra free-form metadata (mDebugInfo) has been added to assist
with logging / debugging.

Bug:140712361
Test: atest android.app.timedetector
Test: atest com.android.server.timedetector
Change-Id: I5305c34516e5f4e254309193183f00e054801a46
2019-10-21 08:42:50 +01:00
TreeHugger Robot
ee4eb8c39d Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master 2019-10-15 00:24:25 +00:00