Commit Graph

640958 Commits

Author SHA1 Message Date
Treehugger Robot
35bd9bdb61 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: a2da3ebb16 am: 88f1ec460a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629

Change-Id: I0292c32f0c0140213aa12309032421a18105bf02
2021-04-22 05:22:10 +00:00
Lajos Molnar
4ef563a2a5 media: polish EncoderProfiles
Made inner classes private.
Added IntDef annotations (also to related CamcorderProfiles methods).
Deprecated CamcorderProfiles.get methods.

Bug: 184714224
Test: atest CamcorderProfileTest
Change-Id: Ibbacb7d3c5f3558f82c109bf36a64f6a3e369b31
2021-04-21 22:20:37 -07:00
Treehugger Robot
88f1ec460a Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: a2da3ebb16
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629

Change-Id: Iccc7fe3e625083ee60a54d0e3719d1c8b2458a72
2021-04-22 05:03:42 +00:00
Wilson Wu
75f46d33c8 Merge "Make IInputMethodPrivilegedOperations to async (3/N)" into sc-dev 2021-04-22 04:50:11 +00:00
Wilson Wu
08f5b9c846 Prevent addtional removeSurface calls
The surface may not be cleared by its owner when
it lose control last time. We had CL[1] to clean
up the surface if we don't plan to show.

Add new checking condition for last control, so
once we have control we only remove the surface
if last control was null.

[1]: I4910c2a06cc67b0470477b245fc1de54b75f10f9

Bug: 185557884
Test: atest InsetsSourceConsumerTest
Change-Id: I1a4f05f9b4cf6fa121554ff0abc9fdc418b95276
2021-04-22 12:46:35 +08:00
Treehugger Robot
a2da3ebb16 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" 2021-04-22 04:43:26 +00:00
Steve Elliott
507a76a7f8 Add callbacks for remote input send / bounced
Bug: 170647553
Test: manual, atest
Change-Id: I47cd16337bbcabbdeb05d60641ff6f41ff294f26
2021-04-22 00:42:58 -04:00
Tiger Huang
755cd83f49 Merge "Stop processing if the new control equals the current one" into sc-dev 2021-04-22 04:23:38 +00:00
junyulai
9180e09070 [SP31] Expose onSetWarningAndLimit System API
Test: atest NetworkPolicyManagerServiceTest NetworkStatsServiceTest
Bug: 149467454
CTS-Coverage-Bug: 183598414
Merged-In: I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf
Change-Id: I6f5e22e3a7b80a38cae9f3c5d7296a1dff34facf
  (cherry-picked from ag/13981689 with fixed merged conflict)
2021-04-22 12:07:13 +08:00
junyulai
a3e0635830 [SP29] Send interface warning bytes to NetworkStatsProvider
This change contains necessary modification in NPMS and NSS
to send warning bytes to NetworkStatsProvider. But since
no any provider has been upgraded to handle such parameter.
Thus, no behavior change is made in this patch.

Test: atest NetworkPolicyManagerServiceTest NetworkStatsServiceTest
Test: atest NetworkPolicyManagerServiceTest#testStatsProviderWarningAndLimitReached
Bug: 149467454
Bug: 170699770
Bug: 170179169
Merged-In: I6c4863030c36328db571294fd12a40e59864def5
Change-Id: I6c4863030c36328db571294fd12a40e59864def5
  (cherry-picked from ag/13982166)
2021-04-22 12:07:12 +08:00
junyulai
386b64d114 [SP29.1] Simplify logic of calculating and applying data limit
This is a no-op refactoring that is needed for accommodating
follow-up change to send warning quota to hardware.

Test: atest NetworkPolicyManagerServiceTest NetworkStatsServiceTest
Bug: 149467454
Bug: 170699770
Bug: 170179169
Merged-In: I073934f3ac4d13b569ea3a295692c76451b7bbfa
Change-Id: I073934f3ac4d13b569ea3a295692c76451b7bbfa
  (cherry-picked from ag/13982165)
2021-04-22 12:07:12 +08:00
junyulai
b6957871db [SP28] Add API for set data warning
To have better control and race-free of set data warning
to tether offload hardware, an interface of set warning and
limit at the same time in the NetworkStatsProvider is needed.

This is a no-op change which expose such interface with minimum
changes in service side to get build pass. The implementation
would be included in follow-up patches.

Test: atest NetworkStatsServiceTest
Test: atest NetworkPolicyManagerServiceTest
Test: atest GtsNetworkStackHostTestCases
Test: m doc-comment-check-docs
Bug: 149467454
Bug: 170699770
Bug: 170179169
Merged-In: I6ee661497f7dedb871c85786d1950cab951d8aa2
Change-Id: I6ee661497f7dedb871c85786d1950cab951d8aa2
  (cherry-picked from ag/13959436)
2021-04-22 12:07:12 +08:00
Hui Yu
50bad756e8 NPMS lock improvement.
Fix NPMS lock contention:
Between 'com.android.server.net.NetworkPolicyManagerService$NetworkPolicyManagerInternalImpl.isUidNetworkingBlocked(int, java.lang.String)' and 'com.android.server.net.NetworkPolicyManagerService$NetworkPolicyManagerInternalImpl.getSubscriptionPlan(android.net.NetworkTemplate) on lock mNetworkPoliciesSecondLock.

Bug: 162350812
Test: regresstion test.
Change-Id: Ibbb4325c7380a2febf3682b3ae3436647ae82e16
Merged-In: Ibbb4325c7380a2febf3682b3ae3436647ae82e16
2021-04-22 12:07:12 +08:00
Hunter Knepshield
ee192b7412 Expose carrier privilege rules certificates as @TestApi.
With the updated CTS UICC spec added this year, some SIM-dependent CTS
tests will need to do runtime inspection of the certificates available
to determine which SIM the test is running with. This information may be
used to e.g. selectively enable tests only for newer SIMs if they
require the updated hardware.

Test: make
Test: atest CtsCarrierApiTestCases
Bug: 178419755
Change-Id: I34fa7392d58585e9559fef886671c759ed2d66b4
Merged-In: I942d4c0c7c786d7c8b561e5e65773367cefffb31
(cherry picked from commit 5bf8a8436f)
2021-04-21 21:04:03 -07:00
Aaron Huang
aeaede831c Add owners for VpnManagerService
Test: N/A
Change-Id: Ia04cba9323f8242915cc1d1c427c237a192e69f3
2021-04-22 12:03:11 +08:00
Hugh Chen
3a82485618 Use LruCache to cache advanced bluetooth deivce icon
This CL uses LruCache to cache advanced bluetooth device icons.
It can reduce the frequency to access content providers to get
advanced device icons since the advanced device icons would
not changed.

Bug: 178255374
Test: make RunSettingsLibRoboTests -j56

Change-Id: I9c8957b5f78ff5047fa4b85fc37a5e27b731465d
2021-04-22 12:00:07 +08:00
Kohsuke Yatoh
62e854c466 Merge "Do not actually reboot the device in VTS test." into sc-dev 2021-04-22 03:59:40 +00:00
TreeHugger Robot
bf8262b57d Merge "Expose carrier privilege rules certificates as @TestApi." into sc-dev 2021-04-22 03:36:21 +00:00
Vishnu Nair
d94823c343 Merge "Introduce ASurfaceTransaction_setOnCommit api" into sc-dev 2021-04-22 03:34:32 +00:00
Lorenzo Colitti
609f5cff0b Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 0549ca0217 am: fe78ceab36 am: 8027b42fe6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: If0d8f99d618173d707d2f473d4f6634c3461f0ca
2021-04-22 03:29:41 +00:00
Treehugger Robot
88d1911f16 Merge "Grant keystore permission to register pull stats" am: 63788ff48a am: e2d58f3789 am: f42a439274
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683905

Change-Id: I06580e0443e78eb4ea23e7aa0278b14ae9e8da3c
2021-04-22 03:29:20 +00:00
JW Wang
2dfa92f782 [automerger skipped] Rewrite how we abandon sessions am: 347843b298 -s ours am: 9843e01c19 -s ours am: 5d4c74e288 -s ours
am skip reason: skip tag Change-Id Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd with SHA-1 347843b298 is already in history

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

Change-Id: I55bca61699dbec495cac97b124ebe22a18c75803
2021-04-22 03:28:30 +00:00
Lorenzo Colitti
8027b42fe6 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 0549ca0217 am: fe78ceab36
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: Iab86e5ecf719ddec0030b343dca9c2586a2cb8ef
2021-04-22 03:27:44 +00:00
Treehugger Robot
f42a439274 Merge "Grant keystore permission to register pull stats" am: 63788ff48a am: e2d58f3789
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683905

Change-Id: I83a3b63a484fa14369297a884aa81253e2c49394
2021-04-22 03:27:34 +00:00
Wei Sheng Shih
2ddcaeb425 Merge "Add luminance condition to validate color contrast." into sc-dev 2021-04-22 03:21:43 +00:00
Nate Myren
08635fe057 AudioManager: add API for mode listener
New API to add/remove a listener for changes to the audio
mode (see existing AudioManager.getMode() API).

Bug: 184891081
Test: atest android.media.cts.AudioModeListenerTest
Change-Id: I0be07d577c7497066b61a1573752343227605fd7
2021-04-21 20:19:46 -07:00
Aaron Huang
0924e0d9d6 Merge "Add getters to UnderlyingNetworkInfo" into sc-dev 2021-04-22 03:09:41 +00:00
Lorenzo Colitti
fe78ceab36 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 0549ca0217
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: Ic098dc012380be363d7acb088dab34343dd250e0
2021-04-22 03:01:56 +00:00
Treehugger Robot
e2d58f3789 Merge "Grant keystore permission to register pull stats" am: 63788ff48a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683905

Change-Id: Ib6ad86c5ba0fd565b7e71989ad5dccb16693f86a
2021-04-22 02:59:27 +00:00
JW Wang
5d4c74e288 [automerger skipped] Rewrite how we abandon sessions am: 347843b298 -s ours am: 9843e01c19 -s ours
am skip reason: skip tag Change-Id Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd with SHA-1 e3a71c6295 is already in history

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

Change-Id: Iecfa43adb1d7dbac8caa98c2b6134a8d91d39db0
2021-04-22 02:58:36 +00:00
Seigo Nonaka
76963fdc6d Update test font name in TypefaceCreatePerfTest
Bug: 185549642
Test: atest TypefaceCreatePerfTest
Change-Id: I3f0bdfe3553f6c7835c158c9e3766462709181e1
2021-04-21 19:57:33 -07:00
Benedict Wong
fbc23c6adb Merge changes I64b56575,I40553a7b am: 80afe1eeee am: f595e45401 am: 0b3c038764
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682062

Change-Id: I50cb828d54b8f7669c33945c7cef8a366c7c316c
2021-04-22 02:50:04 +00:00
JW Wang
663824f55c [automerger skipped] Rewrite how we abandon sessions am: 347843b298 am: da979c048f -s ours
am skip reason: skip tag Change-Id Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd with SHA-1 e3a71c6295 is already in history

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

Change-Id: I22ad88ab307b755b1413c37076c7b1d86cfc8ed9
2021-04-22 02:37:52 +00:00
JW Wang
9843e01c19 [automerger skipped] Rewrite how we abandon sessions am: 347843b298 -s ours
am skip reason: skipped by user wangchun

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

Change-Id: Ib8aa39c8fe9dff5ef43f4e8054111cf62594601b
2021-04-22 02:36:43 +00:00
Lorenzo Colitti
0549ca0217 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." 2021-04-22 02:36:11 +00:00
Treehugger Robot
63788ff48a Merge "Grant keystore permission to register pull stats" 2021-04-22 02:35:34 +00:00
Curtis Belmonte
f98f30b6e8 Merge "Fix BiometricPrompt for face + non-UDFPS fingerprint" into sc-dev 2021-04-22 02:33:43 +00:00
Lucy Chang
e82b66e205 Merge "Account for letterbox space when computing touchable region" into sc-dev 2021-04-22 02:28:25 +00:00
Benedict Wong
0b3c038764 Merge changes I64b56575,I40553a7b am: 80afe1eeee am: f595e45401
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682062

Change-Id: I9aa38eeb37dd3b34145363a1a5dda3944eecfb72
2021-04-22 02:27:09 +00:00
Rhed Jao
69e349150d Merge "Apply package visibility to the getSyncAdapterPackages" into sc-dev 2021-04-22 02:25:06 +00:00
Arc Wang
78d8d4d6cf Merge "Tweak SettingsSpinner UI" into sc-dev 2021-04-22 02:13:18 +00:00
JW Wang
da979c048f Rewrite how we abandon sessions am: 347843b298
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14272926

Change-Id: Ifa1a5296257241448b385061e421e1efc8a2dde2
2021-04-22 02:08:10 +00:00
Benedict Wong
f595e45401 Merge changes I64b56575,I40553a7b am: 80afe1eeee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682062

Change-Id: I368e03087bc78eb80defac73f19a1183121d617a
2021-04-22 02:06:45 +00:00
Benedict Wong
decca62338 Add null pointer check for mConfig in onSessionLost
Bug: 185291618
Test: atest VpnTest
Test: atest Ikev2VpnTest
Change-Id: I492e72b5cc0d4ef9d36910af2d64b0c7eb34d202
2021-04-22 01:38:24 +00:00
Treehugger Robot
fc8683e284 Merge "Add Japanese Photo L size" am: d8464708f6 am: edea4fa173 am: 6275761bbd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527008

Change-Id: I12470fa6debd0ffb49ba18fdf9e1e5cef49a363a
2021-04-22 01:34:55 +00:00
Kevin Han
e39ca6e271 Send boot complete broadcast when unhibernated
Apps that have been force-stopped may want to register job/alarms when
they are no longer force-stopped, so resend the boot complete broadcast
when an app is unhibernated.

Bug: 185261245
Test: atest AppHibernationServiceTest
Test: manual
Change-Id: Ia60f7b566d2f03746b232e0ea5a8002d33703f09
2021-04-21 18:34:40 -07:00
Benedict Wong
80afe1eeee Merge changes I64b56575,I40553a7b
* changes:
  Expose API for retrieval of subscription groups with VCN configured
  Add support for retrieval of configured VCNs by carrier privilege
2021-04-22 01:31:11 +00:00
Ion Crucerescu
530c26e4c5 Added the can host home task flag to TaskDisplayArea
In TaskDisplayArea added the mCanHostHomeTask flag that should
allow/limit a TaskDisplayArea to have a home task.

Bug: 183416428
Test: atest DisplayAreaPolicyTests#testTaskDisplayAreasCanHostHomeTask

Change-Id: I1a34be2c679b3839e5dc91746b71fc6b8c2d88da
2021-04-21 18:26:01 -07:00
Treehugger Robot
6275761bbd Merge "Add Japanese Photo L size" am: d8464708f6 am: edea4fa173
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527008

Change-Id: Ic5ef7bc0a8f4317fb9d4fcfe2e0c62781b39d46f
2021-04-22 01:12:49 +00:00
TreeHugger Robot
9856c29501 Merge "Avoid potential NPE" into sc-dev 2021-04-22 01:10:40 +00:00