Commit Graph

632567 Commits

Author SHA1 Message Date
chaviw
2e605fd668 Add throttling to generateDisplayHash
Calling generateDisplayHash can cause the system to slow down if there
are too many requests. Add throttling logic to prevent apps from calling
the API too frequently. The throttling time is based on a value sent
from ExtServices so it can be adjusted later

Test: DisplayHashManagerTest
Bug: 155825630
Change-Id: Id49d1c4113fc65d7b73a1e7b9fc73f50a8d7041f
2021-03-29 15:54:37 -05:00
Nathan Harold
a79ee5c947 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687 am: 0a247cb555
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: Id6a1712a1522ea767c93d423fd95d35bf5ab9cac
2021-03-29 19:11:07 +00:00
Steven Moreland
dffcfd90c9 Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d am: 615236ca66 am: d99097637f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649648

Change-Id: I9b247f6b3372f1babb19505bd67d026a279b5ec3
2021-03-29 19:08:45 +00:00
Mustafa Emre Acer
7c4f635b3b Merge "Expose TimeManager.suggestExternalTime()" into sc-dev 2021-03-29 18:46:59 +00:00
Winson Chiu
0906f735dc Merge "Enable SETTINGS_API_V2" into sc-dev 2021-03-29 18:44:51 +00:00
Nathan Harold
0a247cb555 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: I16d744757e26f3cfb0a06ca3f618874dfc221bd4
2021-03-29 18:41:00 +00:00
Sudheer Shanka
624f4c5274 Merge "Add API to allow apps with location permission to access data blobs." into sc-dev 2021-03-29 18:25:11 +00:00
Steven Moreland
d99097637f Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d am: 615236ca66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649648

Change-Id: Ibb904c21a845199a7e66c592d5ab2c8e191c97f0
2021-03-29 18:22:24 +00:00
Nathan Harold
365c6b6687 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: Idb601ea0f49f0a027f54e41dfa139c6589b89987
2021-03-29 18:22:21 +00:00
Nathan Harold
f3a83b6c9c Merge changes from topic "telephony-background-cb"
* changes:
  Add a Compat Flag for Throwing For Null Telephony
  Ensure Async APIs receive callbacks
2021-03-29 17:58:41 +00:00
Sudheer Shanka
05f75c2553 Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: 433c866186 am: 4b3348f115
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550

Change-Id: Ic5c9fb2603a010976bc93e5059e5548ee782005e
2021-03-29 17:45:42 +00:00
Steven Moreland
615236ca66 Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649648

Change-Id: Id5fc627c5b0e28c44176ee89f4b3d6574a52b81d
2021-03-29 17:41:26 +00:00
Richard Ho
2335acd9a2 Merge changes from topic "nearby-streaming-policy" into sc-dev
* changes:
  Add policy for nearby app streaming
  Add policy for nearby notification streaming
2021-03-29 17:12:03 +00:00
Steven Moreland
5fdf93fc9d Merge "Keystore 2.0: Update to canonical service name." 2021-03-29 17:02:31 +00:00
Sudheer Shanka
4b3348f115 Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: 433c866186
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550

Change-Id: I354cd41d18cfab87b1302d2dbd0ba5dcd10edca6
2021-03-29 16:57:17 +00:00
Kweku Adams
e3585e106f Merge "Log EJ status to statsd." into sc-dev 2021-03-29 16:21:48 +00:00
Kweku Adams
5edea1db06 Merge "Remove NetworkPolicyManager listener." into sc-dev 2021-03-29 16:21:13 +00:00
Sudheer Shanka
433c866186 Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550

Change-Id: Ia95b11bcf91f18338b26146f6bb9488861555303
2021-03-29 16:19:05 +00:00
Sudheer Shanka
9cff99d059 Merge "Remove NetworkPolicyManager.isUidBlocked() API." 2021-03-29 15:49:15 +00:00
Lucas Dupin
10c1b4f3f9 Merge "Add luma capabilities to ColorStateList" into sc-dev 2021-03-29 15:47:05 +00:00
Jordan Demeulenaere
4f7a421069 Merge "Revert "Swipe notification to edge of screen"" into sc-dev 2021-03-29 15:28:37 +00:00
Joanne Chung
2e3ea6a2ab Merge "Add translation APIs for virtual views." into sc-dev 2021-03-29 15:28:23 +00:00
Winson
9b1cbd6f2b Enable SETTINGS_API_V2
With the Settings screen now merged, this must be enabled by default
so users can approve domains for apps.

Bug: 183940468

Test: manual, try change on lower targetSdk app

Change-Id: I01c3cf16eae8e8addfd4fca58be99165edeee6e7
2021-03-29 08:11:14 -07:00
Junyu Lai
18d2238fa1 [automerger skipped] Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4 am: 37dcb82631 am: fc5e6eded5 -s ours
am skip reason: skip tag Change-Id I073934f3ac4d13b569ea3a295692c76451b7bbfa with SHA-1 5acc19c9ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652211

Change-Id: Iaccf6206d27f5cd1adf9a348deb9da58829c38b9
2021-03-29 15:01:10 +00:00
Jacqueline Bronger
2873f10133 Merge changes from topic "leanback_dialog_background" into sc-dev
* changes:
  Change leanback dialog backgrounds.
  Remove light leanback dialog themes.
2021-03-29 14:46:14 +00:00
Beverly Tai
18f543c54d Merge "Cannot determine Doze state during transition" into sc-dev 2021-03-29 14:34:15 +00:00
Junyu Lai
fc5e6eded5 Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4 am: 37dcb82631
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652211

Change-Id: I73805c127c9a20de1e502ccedfd65195c76a6b6a
2021-03-29 14:16:37 +00:00
Kriti Dang
2b5b144ed0 Merge "Hdr format settings [Backend]" into sc-dev 2021-03-29 13:33:57 +00:00
Junyu Lai
37dcb82631 Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652211

Change-Id: Ie0f37b03ca6644d4be1de95b6ee9396dac101fe4
2021-03-29 13:32:36 +00:00
Kriti Dang
7010f95cb2 Hdr format settings [Backend]
Adding new APIs in display manager to get the user disabled formats, to get the formats
supported by device and get formats reported by display.

Bug: 172905874
Test: N/A
Change-Id: I58a7714f03a3e165bbd22f2fa7a021ad90b41b39
Merged-In: I58a7714f03a3e165bbd22f2fa7a021ad90b41b39
(cherry picked from commit 25f1822005)
2021-03-29 13:21:14 +00:00
Frank Li
f076e68439 [automerger skipped] Merge changes from topic "NetworkAgent02" am: 31e7ebdd30 am: bc5395e42a am: 0616526072 -s ours
am skip reason: skip tag Change-Id Ie0fd5ba816c390bfb7bc6512d896a88482c217ec with SHA-1 37dff3b28a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917

Change-Id: Ie95c3a94fa2a7e730ad43fa545dc82cf20c0e1bd
2021-03-29 12:58:19 +00:00
lifr
9039c976bf [automerger skipped] [TL02]Remove hidden API usage of NetworkAgent am: 0befda4964 am: 8ca2d02922 am: 59cd6f3076 -s ours
am skip reason: skip tag Change-Id I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c with SHA-1 03f6fd2052 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722

Change-Id: I627119002e2d4230939d2017728959934f14a528
2021-03-29 12:58:09 +00:00
Junyu Lai
d1d8c41c6f [automerger skipped] Merge "[SP28] Add API for set data warning" am: ac196a1e07 am: e6b40ed4ca am: d5607d27e9 -s ours
am skip reason: skip tag Change-Id I6ee661497f7dedb871c85786d1950cab951d8aa2 with SHA-1 ac1da4d565 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125

Change-Id: I9c0734c571f46d0211fe013198d37defe323fd62
2021-03-29 12:57:39 +00:00
Junyu Lai
6b9470ffc4 Merge "[SP29.1] Simplify logic of calculating and applying data limit" 2021-03-29 12:47:08 +00:00
Ryan Lin
b9822aba4a Merge "remove period at the end of the subttext" into sc-dev 2021-03-29 12:46:06 +00:00
Sudheer Shanka
d3ba15beeb Remove NetworkPolicyManager.isUidBlocked() API.
It isn't used by ConnectivityService any more and even if
it needs such utility method in the future, we could create
one which is part of connectivity module and doesn't need
to be exposed as part of NetworkPolicyManager API surface.

Bug: 183696103
Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java
Change-Id: Ie3c681f88e4b2b9bb92d2224c5ea96b074f155d5
2021-03-29 12:39:12 +00:00
Sudheer Shanka
a8c60abc86 Merge "Make a couple of constants in MediaSessionService configurable." into sc-dev 2021-03-29 12:37:55 +00:00
Joanne Chung
e1b23cd423 Add translation APIs for virtual views.
Bug: 178046780
Test: manual
Test: atest CtsTranslationTestCases
CTS-Coverage-Bug: 177960696

Change-Id: I99caed0d42b3a164a25c2707eba7057c42c19140
2021-03-29 20:36:40 +08:00
Frank Li
0616526072 Merge changes from topic "NetworkAgent02" am: 31e7ebdd30 am: bc5395e42a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917

Change-Id: If099f376bfd5d456e938612005c4008b0beae91a
2021-03-29 12:14:01 +00:00
lifr
59cd6f3076 [TL02]Remove hidden API usage of NetworkAgent am: 0befda4964 am: 8ca2d02922
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722

Change-Id: Id2679c6437a31718fb7612b07712bf8cef7fa293
2021-03-29 12:13:51 +00:00
Junyu Lai
d5607d27e9 Merge "[SP28] Add API for set data warning" am: ac196a1e07 am: e6b40ed4ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125

Change-Id: I43fa10034699732b6091fe290a4e064478c8a0e1
2021-03-29 12:12:19 +00:00
Jordan Demeulenaere
2b8b48c1e3 Revert "Swipe notification to edge of screen"
This reverts commit 693ac17880.

Reason for revert: This breaks the notification outline during the expand animation. See b/171817112#comment19 for videos.

Change-Id: I671e4bb10bdc8c7e068ced2eb11c2b8b477b534b
2021-03-29 11:59:05 +00:00
Selim Cinek
396cf5e224 Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245 am: 7bd1fed397
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I52c324890ffdda162d116c40311c95b9c7628dd3
2021-03-29 11:55:59 +00:00
TreeHugger Robot
894cde1030 Merge "[Settings] add readable tests to presubmit" into sc-dev 2021-03-29 11:52:22 +00:00
Peter Li
378b540fa1 Merge "Add callback to report HotwordDetectionService status" into sc-dev 2021-03-29 11:43:29 +00:00
Frank Li
bc5395e42a Merge changes from topic "NetworkAgent02" am: 31e7ebdd30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917

Change-Id: If59df525be2483064976d3919cf7033fb94e41e6
2021-03-29 11:43:14 +00:00
lifr
8ca2d02922 [TL02]Remove hidden API usage of NetworkAgent am: 0befda4964
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722

Change-Id: I12342dc4c4ee8748396b7ced2f344611704caa2d
2021-03-29 11:39:55 +00:00
Junyu Lai
e6b40ed4ca Merge "[SP28] Add API for set data warning" am: ac196a1e07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125

Change-Id: Ibdf919a762952350dc89bda59724b2f0cb291313
2021-03-29 11:30:37 +00:00
Selim Cinek
7bd1fed397 Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I30c4cdd28db679f99eac2f1688270b6ffad35573
2021-03-29 11:09:51 +00:00
Frank Li
31e7ebdd30 Merge changes from topic "NetworkAgent02"
* changes:
  Fix cannot success verify count of the networkAgent Config items on R device
  [TL02]Remove hidden API usage of NetworkAgent
2021-03-29 11:08:24 +00:00