Commit Graph

754240 Commits

Author SHA1 Message Date
Weng Su
bc2a0e9fd5 Merge "Restrict WiFi network connection (Internet Panel)" into tm-dev am: a608128250
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17198003

Change-Id: I5bfeada6f0f251dc085ed073300057ada9a275fc
2022-03-18 20:35:15 +00:00
Gaurav Bhola
97b51aceb9 Merge "Make nav bar affected by IME insets" into tm-dev am: b99eca0d67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220765

Change-Id: Ida0c1b84373f7f7968572c504aa8fbced0a9f8a3
2022-03-18 20:35:02 +00:00
TreeHugger Robot
eb6c4b584b Merge "Remove DisplayHashingService constructor" into tm-dev am: c7af3f3088
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17240649

Change-Id: I56ede41e00deb8573f8b90278b2269456c923cb8
2022-03-18 20:29:25 +00:00
Ray Essick
8d97aadd34 Merge "Define MediaFormat crop-related constants" into tm-dev am: 5bb3da076d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17232363

Change-Id: Ib9a385aa3b19d19fbf601d3e5ef21c70fdbe0238
2022-03-18 20:29:11 +00:00
TreeHugger Robot
b792686c8c Merge changes from topics "presubmit-am-c4b3e098a67f4aae8d09beafad040d77", "presubmit-am-c919318fbc2d413296f77381098694db" into tm-dev am: 5462556c37
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17236747

Change-Id: I54824c9839c70f53aca0fb432cf486d561407f4b
2022-03-18 20:28:56 +00:00
Joe Bolinger
47c07108e6 Merge "Invoke lifecycle callbacks while waiting for cookies." into tm-dev am: afde3e325a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039479

Change-Id: Iffe4d0a9cb196f538414f1dbe45523755fc0eea7
2022-03-18 20:28:39 +00:00
Yinglei Wang
42342328c0 Merge "resolve possible Imf lock and a11y mLock deadlock" into tm-dev am: da6d14b9e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17171099

Change-Id: I63b2da112477a8617c0f13206ea6399eca36ae6b
2022-03-18 20:28:24 +00:00
TreeHugger Robot
2dfa8fb8dc Merge "Remove isAnimating check in assignRelativeLayerForIme" into tm-dev am: da78c9e278
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004328

Change-Id: Iff67e72b7d2fb55468f60ff1a306da774a638bc2
2022-03-18 20:28:11 +00:00
Songchun Fan
ebf9becb97 Merge "[pm] restrict max number of components at parsing" into tm-dev am: 313009c2df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17162613

Change-Id: I92bb5806259ae9db5a4b5ff1955b478d92e58383
2022-03-18 20:27:55 +00:00
Jonathan Scott
8de0bece53 Merge "Add setProfileOwnerOnOrganizationOwnedDevice COPE API." into tm-dev am: 9bc9a8bdd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17255325

Change-Id: I539f716ca3c2eaf541ab4e9712224e30ecf37568
2022-03-18 20:27:40 +00:00
TreeHugger Robot
aa5ee0a970 [automerger skipped] Merge "SystemUI: res array for statusbar blocked icons" into sc-v2-dev-plus-aosp am: 30410deeaf -s ours am: 36a37259e0 -s ours
am skip reason: Merged-In I9a04a67a9c0914989d34c8c53ceee97788e7ba6c with SHA-1 1ae9c8d8dd is already in history

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

Change-Id: I23b8b1dba00b59d80f069f2c2e0fa4cc23909e1b
2022-03-18 20:27:29 +00:00
Timi Rautamäki
ba448cf38a [automerger skipped] SystemUI: res array for statusbar blocked icons am: d62853c979 -s ours am: ad22d029af -s ours
am skip reason: Merged-In I9a04a67a9c0914989d34c8c53ceee97788e7ba6c with SHA-1 1ae9c8d8dd is already in history

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

Change-Id: If54f3515df12a3ad392155aaa9464b739bfdde76
2022-03-18 20:27:27 +00:00
Sergey Nikolaienkov
c83da721b0 Merge "Clean up mayAssociateWithoutPrompt()" into tm-dev am: c20e008284
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070467

Change-Id: I883bf8cd0ef9ca0ef30d95cd73259acaf972987b
2022-03-18 20:27:20 +00:00
Sergey Nikolaienkov
d5795beb5c Merge "Fix NPE in CompanionDeviceServiceConnector" into tm-dev am: 2d3584caeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17255330

Change-Id: I95a8222ad95ab1d00c48bb5b21abf87c51d593b5
2022-03-18 20:27:04 +00:00
Sudheer Shanka
252b79779c Merge "Add a hidden API to query appstandby constants." into tm-dev am: 0de55a3459
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17129613

Change-Id: Icc7f816bccb43004a1b913a194d531c548b3cca0
2022-03-18 20:26:48 +00:00
Nikita Dubrovsky
e71cf9f328 Merge "Update READ_CLIPBOARD_IN_BACKGROUND to be grantable via roles" into tm-dev am: 06ddc1fcc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17225832

Change-Id: I55b9e9ed49480e484ef79e0a6f4e0a5fca3d101c
2022-03-18 20:24:49 +00:00
TreeHugger Robot
2946e85d53 Merge "Fix the Settings crash when resetting network" into tm-dev am: dbfe88eed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17238329

Change-Id: I0a6dc5ac8d72c8bc41b904c1fdc79e6e412ab9ba
2022-03-18 20:24:19 +00:00
David Anderson
e582f9c7b1 Merge "Add PackageManager feature strings for EROFS." into tm-dev am: 652c4bade6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17250844

Change-Id: Id4f8fecfad5cfcccf21bc67c5f1c19bd81c210c7
2022-03-18 20:24:04 +00:00
TreeHugger Robot
84e8ee0bc9 Merge "SystemUI: res array for statusbar blocked icons" into tm-dev am: 64aa33f8b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17223607

Change-Id: Id7c89424ec391c5a7c5703917476afa53e01181c
2022-03-18 20:23:52 +00:00
TreeHugger Robot
b1e19bd3ff Merge "Send SDK sandbox UID instead of app UID in battery stats push metrics" into tm-dev am: 34fba3edc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17244143

Change-Id: I6b3cf835115dbf4397b9cf9ee03506b6065da39f
2022-03-18 20:23:38 +00:00
TreeHugger Robot
cbafbea762 Merge changes from topics "presubmit-am-859dd3744ae243f9a8cb2f6234a9ef1e", "register_api" into tm-dev am: 1b58550351
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17182885

Change-Id: Iaa84c80dc3babd3c1742d5ff0e74556e4099f03e
2022-03-18 20:22:51 +00:00
Shan Huang
7589abd647 Fix a problem that Dialog does not close in new dispatch. am: e5f99e6360
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17236904

Change-Id: I019cb6c24af40a02fe3b8f149a59e87d96dfdeee
2022-03-18 20:22:47 +00:00
Joe Bolinger
bdbbc386be Merge "Update documentation for EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY." into tm-dev am: a90ee32654
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17241351

Change-Id: I059ed2b5bf975d18d68645a598e1eb162c3bd375
2022-03-18 20:22:01 +00:00
Oliver Woodman
f2edd27f29 Merge "Hide new route discovery preferences in T" into tm-dev am: f48450217c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220023

Change-Id: Icd2dc4bd17fcd9c81c61c8e2192313e3a7fb585e
2022-03-18 20:21:33 +00:00
TreeHugger Robot
0374c6ee15 Merge "Update hotword detection metrics." into tm-dev am: 12404db03b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17232603

Change-Id: I58c0fb9ad13ff8301f62300406b9c30e92488551
2022-03-18 20:21:14 +00:00
TreeHugger Robot
316f017192 Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" into tm-dev am: ff5b1369dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17211999

Change-Id: Iaafb389c06235a72c61cb08e7f306cbb38d044a1
2022-03-18 20:20:53 +00:00
Pinyao Ting
75b813acf8 Merge "Update capability related api in Shortcut" into tm-dev am: 7f35502d83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17198501

Change-Id: I8011b47af1eb90e5aa21240622123de9ede58121
2022-03-18 20:19:49 +00:00
TreeHugger Robot
3b67f7142a Merge "Fix NotificationStack size calculation" into tm-dev am: 11d05992e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124026

Change-Id: Ice90d953fa08500d11bb6f9d67310d9cbbf18fee
2022-03-18 20:18:48 +00:00
TreeHugger Robot
18bf4a6f64 Merge "Fix bug where GameService#onDisconnected isn't called" into tm-dev am: 7940baa703
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17228662

Change-Id: I13708035b2aa9204cd920e45521d3cffedfc04ec
2022-03-18 20:18:33 +00:00
Kholoud Mohamed
e15c8be61c Merge changes from topic "resetAPIs" into tm-dev am: 3d31e0b93b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17198304

Change-Id: I8d6538dc792686df3240da3c0f59a8ebd78ddf9a
2022-03-18 20:18:02 +00:00
kholoud mohamed
f7da296cfa RESTRICT AUTOMERGE add requiresAPI annotation for DPM#getString am: d782127f6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17198304

Change-Id: I5eaaff4d80a22bc632ed43eb898dfbb05c35c2fe
2022-03-18 20:17:53 +00:00
Raymond Tiong
0a52f15baf Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3 am: 2f04f34eb3 am: d44a439edf am: 6bdc667d3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024

Change-Id: If6377e4bed58575bfc2cff8c48765dc1280ed8c9
2022-03-18 20:15:48 +00:00
TreeHugger Robot
1ed8ea10bf Merge "expand test API for DSP kephrase trigger" into tm-dev am: ad2aa52507
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17224222

Change-Id: I0f4f886ebda137958856b7290d97c68a0183344a
2022-03-18 20:15:34 +00:00
Shubang Lu
fa7da68ac0 Merge "TIAF API review: multiple components" into tm-dev am: bc3aaf19ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128266

Change-Id: I2b3b9bfcf1b2a142ae6e8e017ab4823359a6894d
2022-03-18 20:14:42 +00:00
Jonathan Scott
2232b84f4c Merge "Add finalizeWorkProfileProvisioning." into tm-dev am: 95826d61fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17226323

Change-Id: I05ba1e38ef40ee3927754edaea1f0f6282d5c9ac
2022-03-18 20:13:29 +00:00
Pratyush More
137c791971 Merge "Move LocaleManagerTests to postsubmit suite." into tm-dev am: 7da1954f69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17237985

Change-Id: I4c10091177f625194fece380eb7c2f23e36e6d31
2022-03-18 20:13:03 +00:00
Jiakai Zhang
1073709a5e Merge "Use speed-profile with the cloud profile for apks loaded by other apps." into tm-dev am: f2984242fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070003

Change-Id: I03ee707bd870f440c71c7067594a83731b2b3c88
2022-03-18 20:12:36 +00:00
TreeHugger Robot
889eb4dea9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 739e6935dc -s ours am: 7c7f54ec01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17f633010404a74bcd50c101654d7b34735651e1
2022-03-18 20:12:11 +00:00
TreeHugger Robot
7411f4c807 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 25689aa15c -s ours am: 16bdec814c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0196e131b1cc2d9801e95a993133d5aa1b56576b
2022-03-18 20:10:07 +00:00
Antoan Angelov
cc27c57dcc Merge "Add extra to inform the role holder of the update attempt result" into tm-dev am: b7b3316789
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220027

Change-Id: I7d3097d1e090b023a1d5adf713db447e504850e0
2022-03-18 20:09:50 +00:00
TreeHugger Robot
823ae9d850 Merge changes from topic "presubmit-am-41aad955e1764b2ebacc14f02041d841" into tm-dev am: b9dde3b08c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17221588

Change-Id: Iaaa299f0354808d05fb9325773e6dcbffcbf7568
2022-03-18 20:09:31 +00:00
Bill Yi
7ee133e190 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3989d0403c am: c7f0de4b8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe88843450dfe9837f421499c144a3890d6044e2
2022-03-18 20:09:29 +00:00
TreeHugger Robot
8ec940e505 Merge changes from topic "presubmit-am-9b906fb0c78f4fc1a24e6a750c849577" into tm-dev am: c6b7a1b816
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17222387

Change-Id: I4d5eb63a01af07b83867f5fc1b873fc480b2942f
2022-03-18 20:09:04 +00:00
Bill Yi
66e84f9104 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dd489e6d0e am: 87c9ca856b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I565af43d541e2c69e5c6aef8527a25aa80b8eff5
2022-03-18 20:09:02 +00:00
Corina Grigoras
cb6754c1f7 Merge "Move UiEventLogger interface to modules-utils." into tm-dev am: 2907ec82ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17224503

Change-Id: If872579418bf959cfa6e60e588c134e679a4783b
2022-03-18 20:08:02 +00:00
Xiao Ma
2d7927c046 Merge "Add getInterfaceList module-lib API in EthernetManager." into tm-dev am: 4fbf274bc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17250668

Change-Id: I99a5a6c1994f86e0556a34cc7fee5645b99ee6c1
2022-03-18 20:06:47 +00:00
Antoan Angelov
4fe0b071aa Merge "Make config_devicePolicyManagementUpdater readable by tests" into tm-dev am: 8c241a637e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17044813

Change-Id: I066e2d27479e9f4da0b7f93d11bdd1b770c36998
2022-03-18 20:06:16 +00:00
Antoan Angelov
41ce970196 Merge "Update javadoc for EXTRA_PROVISIONING_ROLE_HOLDER_CUSTOM_USER_CONSENT_INTENT" into tm-dev am: efdd8dba93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17156428

Change-Id: I847fdabe1a5abfe1fde99665b4c6e3bb2856ee16
2022-03-18 20:05:54 +00:00
Antoan Angelov
89b1ccd615 Merge "Add a new result code for the DPMRH updater to signal that the feature is disabled" into tm-dev am: c2b95ea6aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17158484

Change-Id: I1d2e3209640be8e2e9c6b7625d0308b6dfe9e9ce
2022-03-18 20:05:29 +00:00
Neil Fuller
a6ed79f190 Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2 am: 53d21a8591 am: 0fa758c3b8 am: ad7b8429d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083

Change-Id: I2c9031a2ebd20b7a846a05010654b3d93e1cc2e6
2022-03-18 20:04:09 +00:00