Commit Graph

635726 Commits

Author SHA1 Message Date
Neil Fuller
9cb260ac15 Merge "Prepare to make origin list mutable" into sc-dev 2021-04-14 18:36:32 +00:00
Anton Hansson
28bbba90d0 Merge "Remove custom android_test.jar disting" am: 6339fba8a8 am: 8049f5cda2 am: 2b221cb6ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675507

Change-Id: Ib57ebd1d648b66caf8e71d617533c66169eb93a3
2021-04-14 18:35:35 +00:00
Anton Hansson
22efcf8590 Merge "Run bpfmt on StubLibraries.bp" am: cf54ae883b am: 38658a5658 am: 30d0c52c6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675506

Change-Id: Ie936c09e70c22558cffdfae4648b99291a4d1c80
2021-04-14 18:35:07 +00:00
Paul Duffin
b5a78c6a97 Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296ee am: 44b2f6cebd am: 272bf95507
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675866

Change-Id: Ifde8b21834c3dac0cba363a667f7d94e820e18a2
2021-04-14 18:34:43 +00:00
Paul Duffin
788f2858ab Merge "Avoid duplication of compat team email addresses in OWNERS" am: 2435cbfde7 am: 9a4f3c85be am: 6ef49b92d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675865

Change-Id: Ice209b14a61b730a0ea6066f7ae727e424db343f
2021-04-14 18:34:07 +00:00
Paul Duffin
6dac0c69af Merge "Remove com.android.i18n.phonenumbers from libcore packages" am: 0d80c5c432 am: da8ead7229 am: 03559adae9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675524

Change-Id: I9e03d5ed5be3f68535276bf58b29c871fa153b80
2021-04-14 18:33:45 +00:00
Zoey Chen
d2c9a5497c Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" am: 7ffe1efa71 am: 5d8dc1e08c am: 8851487412
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671793

Change-Id: I31e7aa4316a9e854ac8066f0dfb7d51d0584e090
2021-04-14 18:33:02 +00:00
Anton Hansson
2b221cb6ef Merge "Remove custom android_test.jar disting" am: 6339fba8a8 am: 8049f5cda2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675507

Change-Id: Iaf360b6bc73d60b65fc20678ecd823b0d5b4f480
2021-04-14 18:26:23 +00:00
Jeff DeCew
594b99d6f5 Merge "Conversation visual updates" into sc-dev 2021-04-14 18:22:29 +00:00
Anton Hansson
30d0c52c6a Merge "Run bpfmt on StubLibraries.bp" am: cf54ae883b am: 38658a5658
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675506

Change-Id: Ic7666e2e3acecfd1545b5907cd7c04b730e313a0
2021-04-14 18:05:52 +00:00
Paul Duffin
272bf95507 Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296ee am: 44b2f6cebd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675866

Change-Id: If39e9d7f60ea28fe81ab05763d43337f7f5d7dc9
2021-04-14 18:05:38 +00:00
Paul Duffin
6ef49b92d1 Merge "Avoid duplication of compat team email addresses in OWNERS" am: 2435cbfde7 am: 9a4f3c85be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675865

Change-Id: I623ba2087ee0570855dda59c2c32220202129558
2021-04-14 18:05:23 +00:00
Paul Duffin
03559adae9 Merge "Remove com.android.i18n.phonenumbers from libcore packages" am: 0d80c5c432 am: da8ead7229
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675524

Change-Id: I3abb84cc11863a37e3d0f63c7c9c8ea0b56ef7dc
2021-04-14 18:05:04 +00:00
Zoey Chen
8851487412 Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" am: 7ffe1efa71 am: 5d8dc1e08c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671793

Change-Id: I36d9a3cf4e25808b87d3b4f50bf3259bce5755ea
2021-04-14 18:04:07 +00:00
Michel Comin Escude
219106593d Merge "Fixed and decreased isAtEquilibrium thresholds" into sc-dev 2021-04-14 18:03:18 +00:00
Winson Chung
824f5cf953 Merge "Don't account for floating window region in nav bar touchable region" into sc-dev 2021-04-14 17:58:11 +00:00
Matt Pietal
da5461a8b1 Merge "Smartspace - Allow primary card colors to be updated" into sc-dev 2021-04-14 17:56:51 +00:00
Anton Hansson
8049f5cda2 Merge "Remove custom android_test.jar disting" am: 6339fba8a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675507

Change-Id: I8540072c32619cf52139b246e9bcf784c27f3c6a
2021-04-14 17:56:46 +00:00
Dmitri Plotnikov
864454912a Merge "Remove POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev 2021-04-14 17:50:25 +00:00
Anton Hansson
38658a5658 Merge "Run bpfmt on StubLibraries.bp" am: cf54ae883b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675506

Change-Id: I9518c376705f7de903a5ec4bd6f78314bc8e7630
2021-04-14 17:44:44 +00:00
Paul Duffin
44b2f6cebd Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675866

Change-Id: Ibc62e793e19a4c8c90678a55a91c070d2bf0e3d8
2021-04-14 17:40:24 +00:00
Paul Duffin
9a4f3c85be Merge "Avoid duplication of compat team email addresses in OWNERS" am: 2435cbfde7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675865

Change-Id: I26ec52be811224269913a3d0703b0b557b2c7262
2021-04-14 17:35:53 +00:00
Robert Shih
054d15cd3d Merge "MediaDrm#requiresSecureDecoder: Clarify mime type handling and result" into sc-dev 2021-04-14 17:26:40 +00:00
Paul Duffin
da8ead7229 Merge "Remove com.android.i18n.phonenumbers from libcore packages" am: 0d80c5c432
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675524

Change-Id: I348fcb5c0a9f18e618b67fe9c432dac08a084733
2021-04-14 17:25:46 +00:00
Anton Hansson
6339fba8a8 Merge "Remove custom android_test.jar disting" 2021-04-14 17:24:15 +00:00
Anton Hansson
cf54ae883b Merge "Run bpfmt on StubLibraries.bp" 2021-04-14 17:23:42 +00:00
Siim Sammul
8a04f3a9ba Merge "Push the latency histograms to statsd" into sc-dev 2021-04-14 17:20:19 +00:00
Zoey Chen
5d8dc1e08c Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" am: 7ffe1efa71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671793

Change-Id: I2447707c8ece48db7448453c828bd56ecaabae78
2021-04-14 17:19:27 +00:00
Paul Duffin
a48ee296ee Merge "Generalize tools/hiddenapi/checksorted_sha.sh" 2021-04-14 17:17:50 +00:00
Paul Duffin
2435cbfde7 Merge "Avoid duplication of compat team email addresses in OWNERS" 2021-04-14 17:17:32 +00:00
Paul Duffin
0d80c5c432 Merge "Remove com.android.i18n.phonenumbers from libcore packages" 2021-04-14 17:17:04 +00:00
Yohei Yukawa
3b99155905 Merge "Make removeImeSurfaceFromWindow to one-way" into sc-dev 2021-04-14 17:12:18 +00:00
Kohsuke Yatoh
2c973f164b Merge "Verify updated font is used in app process." into sc-dev 2021-04-14 16:56:13 +00:00
Zoey Chen
7ffe1efa71 Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" 2021-04-14 16:32:35 +00:00
Joanne Chung
bef7481684 Merge "Add debug log to help to debug translation problem." into sc-dev 2021-04-14 16:27:31 +00:00
Beth Thibodeau
514f8b70d8 Merge "Open power menu lite on long press power" into sc-dev 2021-04-14 15:47:01 +00:00
Jorge Gil
ebc500ced4 Merge "Fix race when rotating the display during an entry into PIP" into sc-dev 2021-04-14 15:42:21 +00:00
Vishnu Nair
39fff73c04 Merge "Only clear SurfaceControl.Transaction when parcelling as a return value" into sc-dev 2021-04-14 15:27:18 +00:00
Michel Comin Escude
ce30625d47 Merge "Added velocity scalar and updated spring values" into sc-dev 2021-04-14 15:17:26 +00:00
Abhijeet Kaur
6d27ed1a3b Merge "Add ACCESS_MTP permission to Shell for CTS test coverage" into sc-dev 2021-04-14 14:47:43 +00:00
Neil Fuller
5b91a19e2a Prepare to make origin list mutable
This commit copies the pattern used in the time zone detector classes
and applies it to the time detector.

The origin will need to be mutable during tests to allow testing of the
new "external" time source.

Description of the pattern followed:

Environment is the interface used by the Strategy to interact with the
majority of hard-to-fake Android components. FakeEnvironment is used in
the StrategyTest, EnvironmentImpl is the read deal.

EnvironmentImpl further delegates to a ServiceConfigAccessor for
non-user-facing settings. This hides whether the values come from
static config or server flags.

Specifics:

The main change besides additional classes is that the EnvironmentImpl
is now responsible for notifying the strategy of changes that may
influence the choice of time suggestion to use. Previously, the
TimeDetectorService handled notifications, which meant both the
surrounding service object and the enclosed environment object knew
about settings keys being used. Now it's all handled by the Environment.
Later, the same callback from the environment will be used to indicate
the origin list has been changed, once there's a ServerFlag to influence
it.

The new ServiceConfigAccessor is ready for server flags to be used, but
doesn't have any yet. They will be added in a follow-up. This means
there are a few constants that are not currently used, but they will be.

Bug: 183239968
Test: atest services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java
Test: atest services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java
Change-Id: I4462afe12065a10ec762f77887c45611db052fe8
2021-04-14 15:40:42 +01:00
Sean Stout
9692654a41 Merge "Fix race condition triggered by quick stop/start of Dream" into sc-dev 2021-04-14 14:29:02 +00:00
Louis Chang
708d39e53e Merge "Move ActivityThreadTests to presubmit" into sc-dev 2021-04-14 14:13:40 +00:00
Alex Johnston
2052add72d Merge "DPMS setDeviceOwner access control" into sc-dev 2021-04-14 14:11:51 +00:00
Antoan Angelov
f78b620609 Merge "Update EXTRA_PROVISIONING_SUPPORTED_MODES values to flags" into sc-dev 2021-04-14 14:08:19 +00:00
Tony Mak
cf4076db0f Merge "Notify TextClassifier an app is reading the clipboard" into sc-dev 2021-04-14 13:57:43 +00:00
Kholoud Mohamed
3dca1466a0 Merge "Fix bug in LockSettingsService" into sc-dev 2021-04-14 13:54:38 +00:00
John Reck
31164bc1ec Merge "Fix a logspam" into sc-dev 2021-04-14 13:46:27 +00:00
Matt Pietal
a76c5b2bed Smartspace - Allow primary card colors to be updated
This is largely for both AOD and lockscreen, while may have different
colors than launcher. Particularly for AOD, we need to transition to a
WHITE color. Set a primary text color, with expectations that a
secondary color will later be set in order to support cards with
various background colors.

Fixes: 185211979
Test: manual, change to AOD <-> LS
Change-Id: I36fb8e5cfcbac1ec999b2b9df08f42d47507990f
2021-04-14 09:45:39 -04:00
Paul Duffin
11972fd431 Generalize tools/hiddenapi/checksorted_sha.sh
Stops it being specific to frameworks/base. This change works because
$2 is $(REPO_ROOT) and $(REPO_ROOT)/frameworks/base is the same as $PWD
when this script is used in the frameworks/base repo.

Also removes boot/ from the path that identifies hidden API flag files.
This keeps the directory structure needed in the repositories into
which hidden API flag files will be moved simple by removing the need
to have a boot/ directory. The hiddenapi/ directory is required as the
files need their own separate OWNERS file.

A follow up change will move this file into tools/platform-compat to
allow it to be used by other repos.

Bug: 177892522
Test: try and upload changes to hiddenapi flag files
Change-Id: Ifb3690e7c596249fda84eff82f5a53f0b1b6f991
2021-04-14 14:42:15 +01:00