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

643059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
9dca664da3 Merge "Correct AppWidget layout when WP is off" into sc-dev am: 175302bb89 am: 5e7737ad6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14639850

Change-Id: If5fd9f626042439523bfee11a02b679afb6db28e
 2021-05-19 17:39:41 +00:00
Yi Jiang
1ddff75c08 Merge "Adds unit tests for WOL." into sc-dev am: af8ef20fe7 am: 2226d51b4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14627416

Change-Id: I69b0ddf7a9ae31aaffb47c3b49d2c2eb2b00e155
 2021-05-19 17:39:21 +00:00
TreeHugger Robot
5e7737ad6f Merge "Correct AppWidget layout when WP is off" into sc-dev am: 175302bb89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14639850

Change-Id: Iafbccf5f44f8b21837a9f4955cabcb9ce39ebd64
 2021-05-19 17:33:03 +00:00
TreeHugger Robot
175302bb89 Merge "Correct AppWidget layout when WP is off" into sc-dev 2021-05-19 17:26:37 +00:00
Yi Jiang
2226d51b4e Merge "Adds unit tests for WOL." into sc-dev am: af8ef20fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14627416

Change-Id: I71720d8df242bb4c1ca59f6d7504ce2983b63e5f
 2021-05-19 17:25:00 +00:00
TreeHugger Robot
4ab9e8db0d Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev am: c6850e0a9f am: edcbc78517 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607397

Change-Id: Iab262328c565c227e97ba213d9b6cd79f7b5b2fa
 2021-05-19 17:07:32 +00:00
Jack Yu
4ed67a2fbb Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 365fb56a56 am: 2199b3e8e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550550

Change-Id: I81c5dfb4b10fe9c6081373ece123edaca526bb69
 2021-05-19 17:06:52 +00:00
Yi Jiang
af8ef20fe7 Merge "Adds unit tests for WOL." into sc-dev 2021-05-19 17:04:44 +00:00
TreeHugger Robot
8e9c496760 Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev am: c6850e0a9f am: cc99a51dd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607397

Change-Id: I83adaef935aeeab9aa4b601bbf723d5b89448aea
 2021-05-19 16:50:23 +00:00
Jack Yu
c27b799a56 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 365fb56a56 am: 8b5847dbc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550550

Change-Id: Ib7c2d1f188d10c7b30a9af771240a5d0421c7683
 2021-05-19 16:50:07 +00:00
Winson Chung
bc6f362b46 Merge "Fix regression in app drag target windows" into sc-dev am: 90f649445f am: 295004e6c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637477

Change-Id: I14e832b7da7edd4f087bbc57b7e6be0dd26449e1
 2021-05-19 16:49:49 +00:00
Alex Johnston
49589111a2 Merge "Security logging broadcast work profile" into sc-dev am: e9614f06c4 am: 45e95631bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543674

Change-Id: I64f2b48380da9ceb951c19149661bbd3092cc463
 2021-05-19 16:49:33 +00:00
Edgar Wang
1d29b242bf Merge "Remove the maxLines of FooterPreference." into sc-dev am: f414073a73 am: 6563317b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14536869

Change-Id: I679225d50e552cebb1d560cc07d3b91177a3349a
 2021-05-19 16:49:16 +00:00
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
TreeHugger Robot
edcbc78517 Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev am: c6850e0a9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607397

Change-Id: I9470710c8c71f4c2df4e6b0a624ef75c3a69ccd1
 2021-05-19 16:48:05 +00:00
Jack Yu
2199b3e8e9 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 365fb56a56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550550

Change-Id: I06165cee2a73f6b980c49ec85aa2179852c23b7e
 2021-05-19 16:47:43 +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
TreeHugger Robot
cc99a51dd5 Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev am: c6850e0a9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607397

Change-Id: I5a99cd8245fe536d9ccedf280e2babd21e50e250
 2021-05-19 16:33:15 +00:00
TreeHugger Robot
c6850e0a9f Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev 2021-05-19 16:27:04 +00:00
Jack Yu
8b5847dbc7 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 365fb56a56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550550

Change-Id: If0172ba0b1ba5ae58b9a355d0fdd57a058a0d1a9
 2021-05-19 16:26:54 +00:00
Winson Chung
295004e6c5 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: Iddf914f69e6f76dc1ea44aca44b7edcd2e1ab76f
 2021-05-19 16:26:34 +00:00
Alex Johnston
45e95631bf 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: I9b663a119266fe0c9b070d594cfcec380967fcab
 2021-05-19 16:26:22 +00:00
Jack Yu
365fb56a56 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev 2021-05-19 16:26:18 +00:00
Edgar Wang
6563317b22 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: I26dd7358917139a9272d7270865112ecba3915d4
 2021-05-19 16:26:07 +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