Commit Graph

16706 Commits

Author SHA1 Message Date
Dmitri Plotnikov
0751597bf4 Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d am: c22cb8480d am: 9dec696e82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14726213

Change-Id: I40265d4c4552474b989dd16fc061952dbcb0211b
2021-05-26 21:06:45 +00:00
Dmitri Plotnikov
9dec696e82 Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d am: c22cb8480d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14726213

Change-Id: I6a5c05b4ffd799de5d91fe0996de90de3b7f5475
2021-05-26 20:59:49 +00:00
Dmitri Plotnikov
c22cb8480d Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14726213

Change-Id: If51b3289ebd05e19b25de0cc36ff34c63fae5876
2021-05-26 20:53:30 +00:00
Dmitri Plotnikov
1643f794d0 Fix system service power calculation when measured energy is available
Bug: 188930285
Test: atest FrameworksCoreTests:SystemServicePowerCalculatorTest
Change-Id: Ic48bd627b8458cde18f812eb63cbc1e37496326d
2021-05-25 18:26:38 -07:00
Jeff DeCew
f62c474b77 Merge "Resolve Notification.Colors once, instead of lazily." into sc-dev am: f294d0ba5f am: 8d6af97d2b am: 9dc3fc72de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140988

Change-Id: Ife1e9a14027a89c2f2c11865d897adda5c809abb
2021-05-25 17:33:27 +00:00
Jeff DeCew
9dc3fc72de Merge "Resolve Notification.Colors once, instead of lazily." into sc-dev am: f294d0ba5f am: 8d6af97d2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140988

Change-Id: I68dfacee8188abd681a046a9f01e627a7efbc91c
2021-05-25 17:17:30 +00:00
Jeff DeCew
8d6af97d2b Merge "Resolve Notification.Colors once, instead of lazily." into sc-dev am: f294d0ba5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140988

Change-Id: I3beac51a74ec5eec5348f01e0b71ae73925ef035
2021-05-25 16:56:58 +00:00
Jeff DeCew
f294d0ba5f Merge "Resolve Notification.Colors once, instead of lazily." into sc-dev 2021-05-25 16:44:59 +00:00
Alison Cichowlas
61c48e8a70 Merge "Set RESULT_OK on exit via copy button." into sc-dev am: 7014d28df9 am: 5e03ec2456 am: 89721fcbcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670950

Change-Id: Ied84df4724858348304b5ecd0cdc15675935d5e7
2021-05-25 15:57:05 +00:00
Alison Cichowlas
89721fcbcb Merge "Set RESULT_OK on exit via copy button." into sc-dev am: 7014d28df9 am: 5e03ec2456
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670950

Change-Id: Ib730547fee4e78e9cc50655c955e7ea7596317aa
2021-05-25 15:41:03 +00:00
Alison Cichowlas
5e03ec2456 Merge "Set RESULT_OK on exit via copy button." into sc-dev am: 7014d28df9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670950

Change-Id: Ibd73a4a2097f872029076e1014bfd1cad5a1e8ef
2021-05-25 15:24:24 +00:00
Alison Cichowlas
7014d28df9 Merge "Set RESULT_OK on exit via copy button." into sc-dev 2021-05-25 15:04:25 +00:00
Jeff DeCew
cab7d8e011 Resolve Notification.Colors once, instead of lazily.
* Instead of resolving colors as-needed, resolve the entire palette potentially used by the notification at the start.
* Centralize color logic and palette storage into Notification.Colors for easier unit testing.
* Adds unit tests for the Notification.Colors, including validating color contrast ratios for various colors.
* Fix a bug with ColorContrastUtil where the luminosity for dark/light font cutoff was 0.5, which resulted in a max contrast ratio of 1.9 for some colors.  Now contrast ratios of 4.5:1 can be achieved for all colors.
* Removes a few of the color accessors in Notification.Builder which were infrequently used, and replaces them with direct use of Notification.Colors.
* Notification specific colors (primary, secondary, default) have only been used by colorized notifications for a few months.  Remove the dark mode overrides of these, ensuring that colorized notifications have the same exact appearance in light and dark themes.
* Replace the use of the "default" color with the "secondary text color"; this practically only affects the alerted bell icon, is more consistent, and reduces complexity.

Fixes: 187881776
Test: manual
Test: atest android.app.NotificationTest
Change-Id: Ib8840d04093094c324d8bdce5b2e84c93a94db8d
2021-05-25 09:57:11 -04:00
Dmitri Plotnikov
1306c3792a Merge "Fix time-in-foreground to include PROCESS_STATE_FOREGROUND_SERVICE" into sc-dev am: 4113199752 am: df0d816d7e am: 68550d8799
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671229

Change-Id: Icb8a588432c3c9e9f792a0a10495f2b25a11d146
2021-05-24 20:45:47 +00:00
Dmitri Plotnikov
68550d8799 Merge "Fix time-in-foreground to include PROCESS_STATE_FOREGROUND_SERVICE" into sc-dev am: 4113199752 am: df0d816d7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671229

Change-Id: If6750857f54e655a0aec4f347334dc2ab65684a9
2021-05-24 20:30:56 +00:00
Dmitri Plotnikov
73fcaf480a Merge "Fix time-in-foreground to include PROCESS_STATE_FOREGROUND_SERVICE" into sc-dev am: 4113199752
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671229

Change-Id: I62e891f31ddad5e4e2bdce79d2ae57b81de3675d
2021-05-24 20:09:09 +00:00
Dmitri Plotnikov
df0d816d7e Merge "Fix time-in-foreground to include PROCESS_STATE_FOREGROUND_SERVICE" into sc-dev am: 4113199752
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671229

Change-Id: Id36c6015948985303e58d3ef388b9aa6fdd116a7
2021-05-24 20:08:07 +00:00
Dmitri Plotnikov
4113199752 Merge "Fix time-in-foreground to include PROCESS_STATE_FOREGROUND_SERVICE" into sc-dev 2021-05-24 20:02:36 +00:00
Patrick Baumann
c4f9c63bbe Merge "Updates OWNERS files" into sc-dev am: dff37ee6d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687219

Change-Id: Iee0440f821f0d7b0a99f8ac60b05e9782c4440c9
2021-05-24 18:52:50 +00:00
Patrick Baumann
dff37ee6d2 Merge "Updates OWNERS files" into sc-dev 2021-05-24 18:30:19 +00:00
Victor Chang
9478b24cd2 Merge "Disable sentence-case for Georgian" into sc-dev am: 0946a97d06 am: 0d9d0d0521 am: f317cb27bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489968

Change-Id: Id500bbc5d3e9c799a9948065edc4f94fab84e177
2021-05-24 16:26:32 +00:00
Victor Chang
5aa10ca300 Merge "Disable sentence-case for Georgian" into sc-dev am: 0946a97d06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489968

Change-Id: I0aa295994f22289363af9f4909409cc07b390255
2021-05-24 16:04:35 +00:00
Victor Chang
f317cb27bb Merge "Disable sentence-case for Georgian" into sc-dev am: 0946a97d06 am: 0d9d0d0521
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489968

Change-Id: Ieaf81e27b4c6a783786a667ff4057b7ed781bc9c
2021-05-24 16:04:18 +00:00
Victor Chang
0d9d0d0521 Merge "Disable sentence-case for Georgian" into sc-dev am: 0946a97d06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489968

Change-Id: I6b9d84385c215a139c9e96eaa19dbb1b263c3a48
2021-05-24 16:02:00 +00:00
Victor Chang
0946a97d06 Merge "Disable sentence-case for Georgian" into sc-dev 2021-05-24 15:57:25 +00:00
Siim Sammul
1a1cd79951 Merge "Add sharding to BinderCallsStats collection and make it configurable. The hash code of the callsession will be used to select which apis will be collected for based on the configured modulo. This is needed to reduce the amount of data collected from public devices." into sc-dev am: d49a40998a am: 951c268d2b am: ea0bafa480
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440248

Change-Id: I30439bb0d474885830896333c58d1516a000b854
2021-05-24 14:12:00 +00:00
Siim Sammul
ea0bafa480 Merge "Add sharding to BinderCallsStats collection and make it configurable. The hash code of the callsession will be used to select which apis will be collected for based on the configured modulo. This is needed to reduce the amount of data collected from public devices." into sc-dev am: d49a40998a am: 951c268d2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440248

Change-Id: Iaf291e419a41136da79f7f9a3312c9bbc61df066
2021-05-24 13:49:16 +00:00
Siim Sammul
9ea13f2ae2 Merge "Add sharding to BinderCallsStats collection and make it configurable. The hash code of the callsession will be used to select which apis will be collected for based on the configured modulo. This is needed to reduce the amount of data collected from public devices." into sc-dev am: d49a40998a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440248

Change-Id: I559ec7c27252c3d2111a88a395484ff9c6795cdb
2021-05-24 13:32:04 +00:00
Siim Sammul
951c268d2b Merge "Add sharding to BinderCallsStats collection and make it configurable. The hash code of the callsession will be used to select which apis will be collected for based on the configured modulo. This is needed to reduce the amount of data collected from public devices." into sc-dev am: d49a40998a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440248

Change-Id: I680a1342507c882d988f486600da0afdfa1efe67
2021-05-24 13:29:32 +00:00
Siim Sammul
d49a40998a Merge "Add sharding to BinderCallsStats collection and make it configurable. The hash code of the callsession will be used to select which apis will be collected for based on the configured modulo. This is needed to reduce the amount of data collected from public devices." into sc-dev 2021-05-24 13:09:19 +00:00
Soonil Nagarkar
2f06b5a085 Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db am: 54d0f31169 am: 0e6e99d6d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671675

Change-Id: I8ab762faa63cb39c2ea810248a830a4122aa49b5
2021-05-22 05:23:22 +00:00
TreeHugger Robot
c82e4d2328 Merge changes I1de322c9,Id0983d4b into sc-dev am: 453acbbf29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: If93dfeab89c644f67001c144253a594996c96eef
2021-05-22 05:12:50 +00:00
TreeHugger Robot
453acbbf29 Merge changes I1de322c9,Id0983d4b into sc-dev
* changes:
  Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
  Improve IKEv2/IPsec VPN by proposing more IKE algorithms
2021-05-22 05:05:51 +00:00
Soonil Nagarkar
0e6e99d6d1 Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db am: 54d0f31169
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671675

Change-Id: I02e0183b1c3153f81881fa92f68e93f8b906d550
2021-05-22 05:01:15 +00:00
Soonil Nagarkar
54d0f31169 Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671675

Change-Id: Ib4409ee4eaf30fa6e0e2706437fbd41938a48876
2021-05-22 04:39:07 +00:00
Soonil Nagarkar
5f247fea09 Merge "Update location bypass allowlist" into sc-dev am: 20b934e7db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671675

Change-Id: I1d4a6c88f9da605c1b3dec581bfbe90c867bde55
2021-05-22 04:36:59 +00:00
Soonil Nagarkar
20b934e7db Merge "Update location bypass allowlist" into sc-dev 2021-05-22 04:04:54 +00:00
Yan Yan
ff41121597 Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
This commit allows IKEv2/IPsec VPN to propose more algorithms that
newly added in IpSecAlgorithm. Those new algorithms have stronger
security guarantees and better performances.

This commit also removes algorithm name validation because all
algorithms are URL encoded to ensure no special characters create
problems due to their use by VpnProfile for list or field delimiting
(e.g. rfc7539esp(chacha20,poly1305))

Bug: 185265778
Test: atest FrameworksNetTests, CtsNetTestCases
Test: All new algorithms are manually verified
Change-Id: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c
Merged-In: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c
2021-05-21 23:33:23 +00:00
Yan Yan
84a60d23eb Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 94a4cdd4e8 am: 7b8b5fd6de am: 10987d8c02 am: 1a93eb283f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: Icba57c57776bf3df394d5b406fa818032f43a536
2021-05-21 23:26:54 +00:00
Yan Yan
1a93eb283f Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 94a4cdd4e8 am: 7b8b5fd6de am: 10987d8c02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: Id1dc3b15c495b5ab2a3578286bdb6ad57f647a29
2021-05-21 23:13:32 +00:00
Yan Yan
10987d8c02 Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 94a4cdd4e8 am: 7b8b5fd6de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: I0e467627fdbf70d6ec704f1f2be58223df9642ed
2021-05-21 23:12:45 +00:00
Joe Bolinger
804fcb2ca6 Merge changes I57f018e4,Ib1e92278 into sc-dev am: 16cd6bb81f am: f9742d8153 am: 479e47ec0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669695

Change-Id: Ie96c4dca25291de86cdec6fb6e8dad6bcd9cc919
2021-05-21 22:49:13 +00:00
Yohei Yukawa
32bd24d526 Merge "Remove InputMethodManager#reportActivityView()" into sc-dev am: e738cfc898 am: e56486181f am: 170157f875
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14429499

Change-Id: I1e0fd5ed7e8eb1221d5401ec5517fbc698f05e77
2021-05-21 22:48:45 +00:00
Joe Bolinger
479e47ec0d Merge changes I57f018e4,Ib1e92278 into sc-dev am: 16cd6bb81f am: f9742d8153
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669695

Change-Id: I27c0fe0cfa4ab6b26fd7dcf3fe24c603e798ea1a
2021-05-21 22:34:55 +00:00
Yohei Yukawa
170157f875 Merge "Remove InputMethodManager#reportActivityView()" into sc-dev am: e738cfc898 am: e56486181f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14429499

Change-Id: Ie73572eb1c16a80394ca16789540ad582fb89441
2021-05-21 22:34:24 +00:00
Yan Yan
94a4cdd4e8 Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" 2021-05-21 22:00:30 +00:00
Joe Bolinger
f9742d8153 Merge changes I57f018e4,Ib1e92278 into sc-dev am: 16cd6bb81f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669695

Change-Id: Ia1803709a97e0bcc6905cd3f00da3d9e0e66009f
2021-05-21 21:43:34 +00:00
Yohei Yukawa
e56486181f Merge "Remove InputMethodManager#reportActivityView()" into sc-dev am: e738cfc898
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14429499

Change-Id: Id5b4932a00aa13b8485203dc3ed8aa73df9db0d1
2021-05-21 21:43:08 +00:00
Joe Bolinger
4a4261ed17 Merge changes I57f018e4,Ib1e92278 into sc-dev am: 16cd6bb81f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669695

Change-Id: I18c6dd68afe0697d7c39a4bce15ea1dc1e694314
2021-05-21 21:41:53 +00:00
Yohei Yukawa
2098780f50 Merge "Remove InputMethodManager#reportActivityView()" into sc-dev am: e738cfc898
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14429499

Change-Id: I16173b64a5172e61f200e4111bb215828bc4842e
2021-05-21 21:41:26 +00:00