616700 Commits

Author SHA1 Message Date
TreeHugger Robot
4fa37e6985 Merge "AudioService: cache routing queries by stream types" 2020-12-23 19:57:11 +00:00
Roshan Pius
78111d5950 Convert WifiInfo to TransportInfo am: 6c5626edfc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec367e9c4d4ec69809e20abc3bb78bea2e4d6d3a
2020-12-23 19:54:52 +00:00
Suprabh Shukla
01b2e17cbd Copy the list before passing to deliverAlarms
Downstream code from deliverAlarmsLocked can cause removeLocked or
removeImpl to be called which changes the size of the list.

Test: atest FrameworksMockingServicesTests:com.android.server.alarm

Bug: 175701084
Change-Id: I5228c323bb9698864c467e9e4c400459ca404b3c
Merged-In: I5228c323bb9698864c467e9e4c400459ca404b3c
2020-12-23 19:53:26 +00:00
Roshan Pius
e126101fe6 Merge changes from topic "wifi_transport_info_stage_1"
* changes:
  WifiInfo: Add equals implementation
  Convert WifiInfo to TransportInfo
2020-12-23 19:37:10 +00:00
Juneup Park
5504a25a6f RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver
When device changes from SCREEN_OFF to SCREEN_ON, AlarmManagerService deliver non-wakeup alarms.
If there is TIME_TICK alarm in mPendingNonWakeupAlarms, TIME_TICK alarm is rescheduled.
While TIME_TICK alarm is set again, it is removed from mPendingNonWakeupAlarms.
Because removing alarm from mPendingNonWakeupAlarms change size of mPendingNonWakeupAlarms,
last alarm in mPendingNonWakeupAlarms is not delivered.

Test: build / boot
Change-Id: If0ab601248b4833855e03157cc47ffc678b3b974
Merged-In: I5228c323bb9698864c467e9e4c400459ca404b3c
2020-12-23 19:35:03 +00:00
Jeff DeCew
a5de05830d Apps targeting S can't be exempt from having an expanded view.
Also fixes a small bug that this revealed where right_icon needs to be explicitly cleared.

Test: manual
Fixes: 173550917
Change-Id: Idbbf71ab92876c8cbcfecfac29eaad9d5e6ac485
2020-12-23 14:29:00 -05:00
Jeff DeCew
2ce46560c3 Add a setting to test the new notification rules on existing apps.
Test: manual
Change-Id: I560ac597bf8e8320d1d9e404ffcf1e6464cfe82d
2020-12-23 14:29:00 -05:00
Chi Zhang
2d6a37ea0e [automerger skipped] Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e55446222 am: 96caf6d111 am: b09d63e1fa -s ours
am skip reason: Change-Id I3e8a168a288a436739c369cdaa2ad00f4b4576ed with SHA-1 4bdb3e0561 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I302d89d7fe6479179d7860cd4cf004e7a17eb952
2020-12-23 18:54:40 +00:00
Anton Hansson
d22c0fa659 Merge "Remove two unused libraries" am: 2458e4ad5d am: 97bf4d0551 am: a914538105
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide06e37c4bec2eac5b65b277307ffcfb96cfedf7
2020-12-23 18:54:04 +00:00
Roshan Pius
7db76b6723 Merge changes from topic "wifi_transport_info_stage_1"
* changes:
  WifiInfo: Add equals implementation
  Convert WifiInfo to TransportInfo
2020-12-23 18:35:31 +00:00
Chi Zhang
b09d63e1fa Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e55446222 am: 96caf6d111
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d123b95985960f4f8e0243e22071e5aa8fc69dc
2020-12-23 18:34:59 +00:00
Anton Hansson
a914538105 Merge "Remove two unused libraries" am: 2458e4ad5d am: 97bf4d0551
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id61f9d67f948dfde4d5398e756f6394a4d358270
2020-12-23 18:34:34 +00:00
Amy Zhang
132c50ea86 Merge "Allow Tuner to update client priority without override the default priority" 2020-12-23 18:23:24 +00:00
Sooraj Sasindran
68a5150e9b Update documentation for secondary carrier bandwidth
Update documentation for secondary carrier bandwidth
to indicate that some modems may not fill the same.

Test: build
Bug:162373679
Change-Id: I4b6b3ea60e72a2c7010e2afb3e8b8a71b5890854
2020-12-23 18:20:16 +00:00
Chi Zhang
96caf6d111 Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e55446222
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a3d1baf4a9449831261728c6f6bb092ade3816b
2020-12-23 18:09:13 +00:00
TreeHugger Robot
c8c707c171 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 18:08:46 +00:00
Anton Hansson
97bf4d0551 Merge "Remove two unused libraries" am: 2458e4ad5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4f69a012e2f0f26264382f39fd6d2ef86d50a8d
2020-12-23 18:05:47 +00:00
Bernardo Rufino
ca14829798 Make ImmersiveModeConfirmation trusted
This is the window that appears when an app uses immersive mode for the
first time ("Viewing full screen"), rendered by the system, hence
trusted for go/untrusted-touches.

Fix: 173355690
Bug: 158002302
Test: 1. adb shell settings delete secure immersive_mode_confirmations
      2. Play a video on YouTube, then enter fullscreen, verify clicks
      outside the dialog go through and don't trigger the toast/logcat.
Change-Id: I435a1be99d62579d1ce2eb49129d7b6475a27a7b
2020-12-23 17:56:03 +00:00
Baligh Uddin
693c6f7af2 Add visibility rule for migration.
Add paths to visibility needed for tests.
Soong allows specifying paths w/o validation.  Once the
migration is complete, we can remove the old path in
visibility rules.

BUG: 137323948
Test: TH
Merged-In: I2bf7e83bb6f4fd67f7826bf8087674a82c6577c9
Change-Id: I9a25986803126adc175e9da9638586b463dda774
2020-12-23 17:47:18 +00:00
Chi Zhang
6e55446222 Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." 2020-12-23 17:22:16 +00:00
TreeHugger Robot
dd95959991 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 17:20:21 +00:00
Suprabh Shukla
0f267888c9 Merge "Copy the list before passing to deliverAlarms" 2020-12-23 17:20:15 +00:00
Anton Hansson
2458e4ad5d Merge "Remove two unused libraries" 2020-12-23 17:18:12 +00:00
Bill Yi
47aeda8251 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I52f92e3307363ef3271aaf5f9d561f8cf22ff24a
2020-12-23 09:15:05 -08:00
TreeHugger Robot
b6cf567c4c Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 17:05:29 +00:00
TreeHugger Robot
19f881a9ad Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 16:58:39 +00:00
TreeHugger Robot
4d633819d3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 16:53:08 +00:00
TreeHugger Robot
3709f9bb52 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 16:41:03 +00:00
Jeff DeCew
9f74d0a408 Add SettingsProvider team as OWNERS of android.provider.Settings
Change-Id: Ifa4a11780bb934f7b644ad150f3c09493b23f9f4
2020-12-23 16:35:05 +00:00
TreeHugger Robot
2d59d2f2b8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 16:31:54 +00:00
TreeHugger Robot
de3ad88fb5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 16:21:01 +00:00
Bill Yi
854373fa34 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia3dd9ce6411c773f0f778d7d6fef3ee3389ea0dd
2020-12-23 15:51:40 +00:00
Suprabh Shukla
2c2e1bf150 Copy the list before passing to deliverAlarms
Downstream code from deliverAlarmsLocked can cause removeLocked or
removeImpl to be called which changes the size of the list.

Test: atest FrameworksMockingServicesTests:com.android.server.alarm

Bug: 175701084
Change-Id: I5228c323bb9698864c467e9e4c400459ca404b3c
2020-12-23 07:42:25 -08:00
Anton Hansson
9e8328287c Merge "Allow-list service-permission to not track latest api" am: dd5e2cd505 am: 48b91458bd am: 0fb45fadbc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534424

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7d62f96ebaac6fbf24228fb6324a4b8b8037956
2020-12-23 15:28:18 +00:00
Baligh Uddin
f4cba21261 Merge "Add visibility rule for migration." am: 447d6af218 am: f1efba5a92 am: dac717cd02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe6c9432ff239e50b11add743b05768b576cd86
2020-12-23 15:26:57 +00:00
Aaron Huang
120dfbbec5 Have NetworkPolicyManagerService create MultipathPolicyTracker
To make connectivity service mainline, this patch makes
MultipathPolicyTracker as a submodule of NetworkPolicyManagerService
to remove the dependencies of ConnectivityService.

Bug: 175015282
Test: FrameworksNetTests
Change-Id: I82a7c62069ffd0683deb2f5ce2f99de120a2a16f
2020-12-23 23:17:15 +08:00
Anton Hansson
0fb45fadbc Merge "Allow-list service-permission to not track latest api" am: dd5e2cd505 am: 48b91458bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534424

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20418e10ff34befa8c5a77d0ba266f59df87887d
2020-12-23 15:11:20 +00:00
Baligh Uddin
dac717cd02 Merge "Add visibility rule for migration." am: 447d6af218 am: f1efba5a92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0495d6b95524907f46a511b781b5119dec502bea
2020-12-23 15:11:04 +00:00
Anton Hansson
fc948d8675 Unbundle ART API from android-non-updatable
Stop tracking the ART APIs in the non-updatable current.txt, and
instead add in the txt/srcjar/jar files produced by the art module's
java_sdk_library.

Bug: 173606718
Test: manual last_released check of merged api txt (b/174847574 to
      automate)
Change-Id: I446a381f2b364a114ce391b99a13742d6769f14d
2020-12-23 14:51:17 +00:00
Anton Hansson
f435d200b7 Remove two unused libraries
These were used temporarily before merged stubs were ready,
but they are not used anymore.

Test: m
Change-Id: I517f64353749ffd8d92b8ddbc1dd8b7af75f2176
2020-12-23 14:50:11 +00:00
Bill Yi
57cae1eccd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I967821add3d6aa3725ae42c0a144d5407240d63a
2020-12-23 14:45:04 +00:00
Anton Hansson
48b91458bd Merge "Allow-list service-permission to not track latest api" am: dd5e2cd505
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534424

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b59bb733630b806098e54ed4cd01ffb3864504b
2020-12-23 14:39:25 +00:00
Baligh Uddin
f1efba5a92 Merge "Add visibility rule for migration." am: 447d6af218
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ab810e279688d0f3e527a30d5687c6d1aa85200
2020-12-23 14:19:21 +00:00
Anton Hansson
dd5e2cd505 Merge "Allow-list service-permission to not track latest api" 2020-12-23 14:15:03 +00:00
Anton Hansson
c05745da39 Merge "Allow-list yet-to-be-modules to not have last-api tracking" 2020-12-23 14:13:45 +00:00
Baligh Uddin
447d6af218 Merge "Add visibility rule for migration." 2020-12-23 14:00:55 +00:00
Les Lee
b241613297 Merge changes from topic "bridged_AP_callback"
* changes:
  wifi: Add callback onConnectedClientsOrInfoChanged handling
  wifi: Add new callback to support use case in bridged mode
2020-12-23 13:53:17 +00:00
Nikita Ioffe
cf749b9154 [automerger skipped] Merge "Fix ApexManager#snapshotCeData (3/n)" am: 3a9796a8c6 am: 299da8f790 am: 85de24f37f -s ours
am skip reason: Change-Id I10ed0e3adef88a27ee239c183d99a836b623d0d1 with SHA-1 6d8e4e5a40 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70dbc6cca301cd27a913e021a6ffa9ad017bf858
2020-12-23 13:49:10 +00:00
Adam Wright
68e25d8da0 Merge "Revert "Prefetching can be interupted by other service requests."" 2020-12-23 13:48:53 +00:00
Andrei-Valentin Onea
92c74acd69 Merge "Don't cap the targetSDK for change id's in UI" am: 816f4ed50f am: 073b8d2381 am: 7d7459bf24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41f9bf9bc24c1e7fb5e3fd603208987db6a3c09a
2020-12-23 13:48:19 +00:00