Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
643,033 Commits 3 Branches 0 Tags
bcbcaa5671bc0abbfc888ff90330c2a077029fcb
Commit Graph

643033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
bcbcaa5671 [automerger skipped] Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3 am: f245f49e05 -s ours 
am skip reason: Merged-In Ia1995ec9503dbd2b12e0b5b5f92a96e02f85beec with SHA-1 bc4a843f18 is already in history

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

Change-Id: I2812edf28ac696bf428e9c26ad699f8248204aea
 2021-05-19 16:49:05 +00:00
Rahul Sabnis
e9d9f66f2b Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev am: b8cfbebbec am: f1f65ab7dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502

Change-Id: Iad61cab6caf0aa5deb1871928a3d7a4c2b96b6f7
 2021-05-19 16:48:17 +00:00
Winson Chung
9c748835cd Merge "Fix regression in app drag target windows" into sc-dev am: 90f649445f am: 3856b08bc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637477

Change-Id: Ia28af169c191ef33f54552d8dae6af696ea9bdf0
 2021-05-19 16:43:54 +00:00
Alex Johnston
068da3ae6c Merge "Security logging broadcast work profile" into sc-dev am: e9614f06c4 am: 9b8ad4433f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543674

Change-Id: Ie263149fe5f29a6e37a892960b28f5d8a1239f6b
 2021-05-19 16:43:37 +00:00
Edgar Wang
e974a7e6c5 Merge "Remove the maxLines of FooterPreference." into sc-dev am: f414073a73 am: 610266c376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14536869

Change-Id: I2b5bf1fc5ea3a4bf633d9aca91bca4aff226dfe7
 2021-05-19 16:43:19 +00:00
Neil Fuller
b1377cb2e6 Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3 am: 17ba82b205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621137

Change-Id: Ib3572de4e1ba60a59c3528050401f4c1b5720ffb
 2021-05-19 16:41:55 +00:00
Rahul Sabnis
133f9e4da4 Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev am: b8cfbebbec am: 423ee1c59f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502

Change-Id: I0110ced9296eea7ae6b7b6697739a39f9fb6b888
 2021-05-19 16:41:21 +00:00
Neil Fuller
f245f49e05 Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621137

Change-Id: I4ced22912f1f7d28342a30dbf8e61f3558785fef
 2021-05-19 16:25:54 +00:00
Winson Chung
3856b08bc7 Merge "Fix regression in app drag target windows" into sc-dev am: 90f649445f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637477

Change-Id: I4fa40dd61b44848a78e8fc10c303daa8e0b57425
 2021-05-19 16:25:10 +00:00
Alex Johnston
9b8ad4433f Merge "Security logging broadcast work profile" into sc-dev am: e9614f06c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543674

Change-Id: I4e8ec6b944161ef0c7f9a6a1feb1dc9f38a958ae
 2021-05-19 16:24:54 +00:00
Rahul Sabnis
f1f65ab7dc Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev am: b8cfbebbec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502

Change-Id: I0cc8db6af04a343bb520176fbe8bd3a26780065b
 2021-05-19 16:24:50 +00:00
Edgar Wang
610266c376 Merge "Remove the maxLines of FooterPreference." into sc-dev am: f414073a73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14536869

Change-Id: I811198f4256adbe4cb6db32314ac734964455611
 2021-05-19 16:24:30 +00:00
Neil Fuller
17ba82b205 Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621137

Change-Id: Ia3343e4f04533f59f56e0e02464f354fa1230418
 2021-05-19 16:24:03 +00:00
Rahul Sabnis
423ee1c59f Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev am: b8cfbebbec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502

Change-Id: Ie9981f42551d47dd654d3cf38f4dbfd3f5d44607
 2021-05-19 16:22:47 +00:00
Winson Chung
90f649445f Merge "Fix regression in app drag target windows" into sc-dev 2021-05-19 16:18:21 +00:00
Alex Johnston
e9614f06c4 Merge "Security logging broadcast work profile" into sc-dev 2021-05-19 16:17:24 +00:00
Edgar Wang
f414073a73 Merge "Remove the maxLines of FooterPreference." into sc-dev 2021-05-19 16:16:39 +00:00
Neil Fuller
bc9061fdf3 Merge "Add permission to shell for CTS test" into sc-dev 2021-05-19 16:11:12 +00:00
TreeHugger Robot
b4840044e8 Merge "Deprecate Context#createApplicationContext" into sc-dev am: ee438f960a am: 08e7de9d46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14528644

Change-Id: I0c98374dd357fb28c12db02e26ead2abc26565ee
 2021-05-19 16:00:29 +00:00
Rahul Sabnis
b8cfbebbec Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev 2021-05-19 16:00:04 +00:00
Rubin Xu
c6c103e77b Merge "Send network & security logging callbacks in foreground" into sc-dev am: 68aa35b03d am: a02f71dded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14530944

Change-Id: I8faf07dddeb19621a37cfbd42a94e44f9335146f
 2021-05-19 16:00:02 +00:00
TreeHugger Robot
71cfbc3b02 Merge "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."" into sc-dev am: 393cd159ae am: 141a4e0455 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640418

Change-Id: I599524addcfb7d8a4977ffae4531c731fc191f1f
 2021-05-19 15:59:45 +00:00
Tiger Huang
680a706a81 Merge "Force showing navigation bar while IME is visible" into sc-dev am: a254d7fd43 am: 5b00823d7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486201

Change-Id: I43ea02325bfc0503e37406d1e6e65a71374a6a55
 2021-05-19 15:59:29 +00:00
TreeHugger Robot
891659ba75 Merge "Deprecate Context#createApplicationContext" into sc-dev am: ee438f960a am: d95a9ebbfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14528644

Change-Id: Ic04a2c0b987e2646bff7872512b6645d0712160f
 2021-05-19 15:59:13 +00:00
Rubin Xu
86c5d31714 Merge "Send network & security logging callbacks in foreground" into sc-dev am: 68aa35b03d am: d10d363e80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14530944

Change-Id: Ida18c6b7207eef4ed3839d3ca2fc50f5838d8585
 2021-05-19 15:59:04 +00:00
Automerger Merge Worker
8d4864d35b Merge "Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e9a am: ef9ab1a419" into sc-v2-dev-plus-aosp 2021-05-19 15:58:41 +00:00
TreeHugger Robot
4b3a4f7077 Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e9a am: ef9ab1a419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344090

Change-Id: I5f752916864f7c86c97ae467b39b558fda01cc4d
 2021-05-19 15:58:35 +00:00
TreeHugger Robot
da80076881 Merge "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."" into sc-dev am: 393cd159ae am: 5ee0f1c551 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640418

Change-Id: I03569b5a541cac6123b587967fa529d9a6ab5e29
 2021-05-19 15:58:31 +00:00
Tiger Huang
99b11e0bdb Merge "Force showing navigation bar while IME is visible" into sc-dev am: a254d7fd43 am: 19c08f146a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486201

Change-Id: Ibe0bd81ddb05eaf082eae81e3da80d3daafd59ea
 2021-05-19 15:57:51 +00:00
TreeHugger Robot
87f411576a Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e9a am: 96dbff6fb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344090

Change-Id: Iaaac17be2fc02d36b0699ee5be684972fb387c6a
 2021-05-19 15:56:41 +00:00
TreeHugger Robot
d95a9ebbfb Merge "Deprecate Context#createApplicationContext" into sc-dev am: ee438f960a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14528644

Change-Id: I9a5eeea6f94d3e4924d67013ec20c631bc85d62c
 2021-05-19 15:41:50 +00:00
TreeHugger Robot
08e7de9d46 Merge "Deprecate Context#createApplicationContext" into sc-dev am: ee438f960a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14528644

Change-Id: Idb9578a41fe9b53f2dcce14b80ebe5a61471e52a
 2021-05-19 15:40:21 +00:00
Rubin Xu
a02f71dded Merge "Send network & security logging callbacks in foreground" into sc-dev am: 68aa35b03d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14530944

Change-Id: I33387735d9c8ebc1efc59804a2ec1f1659826765
 2021-05-19 15:40:00 +00:00
TreeHugger Robot
ee438f960a Merge "Deprecate Context#createApplicationContext" into sc-dev 2021-05-19 15:35:09 +00:00
Rubin Xu
d10d363e80 Merge "Send network & security logging callbacks in foreground" into sc-dev am: 68aa35b03d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14530944

Change-Id: I91fbfad40f7797d90b9ac7e658cf9c455da39121
 2021-05-19 15:35:03 +00:00
TreeHugger Robot
5ee0f1c551 Merge "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."" into sc-dev am: 393cd159ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640418

Change-Id: I7c0495d9390d34dd630579d19016328e01e5ef1d
 2021-05-19 15:34:37 +00:00
Rubin Xu
68aa35b03d Merge "Send network & security logging callbacks in foreground" into sc-dev 2021-05-19 15:34:31 +00:00
Tiger Huang
19c08f146a Merge "Force showing navigation bar while IME is visible" into sc-dev am: a254d7fd43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486201

Change-Id: I827bda6b9dc86d9cc223c68d551a97b38a9a6af2
 2021-05-19 15:34:15 +00:00
TreeHugger Robot
141a4e0455 Merge "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."" into sc-dev am: 393cd159ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640418

Change-Id: I941f58b34b30fab29bbc2da5bb6fa142fdecf11e
 2021-05-19 15:34:14 +00:00
Tiger Huang
5b00823d7e Merge "Force showing navigation bar while IME is visible" into sc-dev am: a254d7fd43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486201

Change-Id: I7f460b9435bd20bb34d1e0c578e5d0d725d371db
 2021-05-19 15:33:56 +00:00
TreeHugger Robot
96dbff6fb2 Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344090

Change-Id: Ife3c273f30b0ec1863e3d3c5d726466613a6a762
 2021-05-19 15:33:42 +00:00
TreeHugger Robot
ef9ab1a419 Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344090

Change-Id: Ia9f80207d4651a19212ac69f54dac35dfabbb8cd
 2021-05-19 15:32:51 +00:00
TreeHugger Robot
393cd159ae Merge "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."" into sc-dev 2021-05-19 15:31:56 +00:00
Tiger Huang
a254d7fd43 Merge "Force showing navigation bar while IME is visible" into sc-dev 2021-05-19 15:25:17 +00:00
TreeHugger Robot
cf5b205e9a Merge "Extend set user protected packages for multi-user" into sc-dev 2021-05-19 15:14:39 +00:00
Les Lee
184f594893 [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 6fff3df429 -s ours am: 046ba845e6 -s ours 
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 559d4ec575 is already in history

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

Change-Id: I1aca453aad83a38deb0bf56646b6e302e0945ba7
 2021-05-19 15:07:50 +00:00
Zimuzo Ezeozue
dd5dae589a Merge "Improve secondary volume mounts on user switch" into sc-dev am: 58b0886913 am: 2ba02de004 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621130

Change-Id: I2c29728ec7ee1d5e7014c6612914e5b7c4fc386b
 2021-05-19 15:07:40 +00:00
Les Lee
5523950e94 [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 6fff3df429 am: aa6feb95bb -s ours 
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 d9b6ed80b9 is already in history

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

Change-Id: Ifd58def553962ce413d77ad619aaed0e7015d216
 2021-05-19 15:07:34 +00:00
Zimuzo Ezeozue
4bb589ca5e Merge "Improve secondary volume mounts on user switch" into sc-dev am: 58b0886913 am: b3e9d6bed9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621130

Change-Id: I9db9ad639c3329b6fc78a6e2ac940f1ad942550e
 2021-05-19 15:07:21 +00:00
Ryan Mitchell
001fe2b530 Merge "Add <staging-public-group> tags to SV2" into sc-v2-dev am: 7a987a6e97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607556

Change-Id: I5dd07e830a2225abc4891682463a8c603b4587b0
 2021-05-19 15:06:26 +00:00