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

643003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
40760cf135 Merge "Ignore regions specified by the nav bar overlay" into sc-dev am: 2270932699 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14613143

Change-Id: I17f9da9a571932fa7b98f56a795266432c1e7c58
 2021-05-19 22:16:33 +00:00
Winson Chung
2270932699 Merge "Ignore regions specified by the nav bar overlay" into sc-dev 2021-05-19 21:58:15 +00:00
Miranda Kephart
ef8355008a Merge "Fix repeated screenshots in landscape" into sc-dev am: 330f8f000d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14600386

Change-Id: I8967d714bbd30c536a6b8fecb08f44b2e5d65e21
 2021-05-19 21:18:37 +00:00
Miranda Kephart
330f8f000d Merge "Fix repeated screenshots in landscape" into sc-dev 2021-05-19 21:04:39 +00:00
TreeHugger Robot
2b25f043b8 Merge "Revert "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionCo..."" into sc-dev am: 92c4b3d31d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14645039

Change-Id: I7f51c736bd0c5e79225c059ffa69ea34885c032f
 2021-05-19 20:29:32 +00:00
TreeHugger Robot
92c4b3d31d Merge "Revert "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionCo..."" into sc-dev 2021-05-19 20:11:21 +00:00
TreeHugger Robot
f23a0cf71a Merge "Ensure the game mode setting doesn't conflict with available modes" into sc-dev am: 6b843a1b8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457704

Change-Id: I15670651e729c9f9a5a34275d8d0c266b9c6dfa1
 2021-05-19 19:47:37 +00:00
TreeHugger Robot
6b843a1b8c Merge "Ensure the game mode setting doesn't conflict with available modes" into sc-dev 2021-05-19 19:40:54 +00:00
Evan Severson
47119a4e5a Merge "Create non-bypassable op restrictions" into sc-dev am: 05a30e41f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543280

Change-Id: Idf413d6f9faca74900dd4ad3159f04309c457844
 2021-05-19 19:39:41 +00:00
Evan Severson
05a30e41f3 Merge "Create non-bypassable op restrictions" into sc-dev 2021-05-19 19:24:22 +00:00
Brad Ebinger
26234eb4c5 [automerger skipped] Merge "Clarify some UCE API docs" am: bd5ef43130 am: 329bf89cc9 -s ours 
am skip reason: Merged-In I139455c286378ccfac876014656f8d3177bdba9d with SHA-1 722cacf24d is already in history

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

Change-Id: Ib731a94e4eb18c66aad54d19425a1835ad72aa4d
 2021-05-19 19:08:55 +00:00
Mady Mellor
b22e1ee6f9 Merge "Bubbles styling: flyout changes" into sc-dev am: 3952307a8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508389

Change-Id: I2b2f80c216079c423e44cf260ab7293eafe4590e
 2021-05-19 18:39:12 +00:00
Mady Mellor
3952307a8c Merge "Bubbles styling: flyout changes" into sc-dev 2021-05-19 18:28:10 +00:00
Brad Ebinger
329bf89cc9 Merge "Clarify some UCE API docs" am: bd5ef43130 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708066

Change-Id: If92568a7e28d82dc31546f446efd61bc5c4c22f0
 2021-05-19 18:26:32 +00:00
Mady Mellor
1099d370ab Merge "Fix some sizes that weren't changing for font scale / display size`" into sc-dev am: 9f97f89342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508388

Change-Id: Ifdb49df9bddb903f4ebfbe89c9f1b53865d86029
 2021-05-19 18:24:00 +00:00
Rubin Xu
23d868b823 Merge "Add device admin restrictions for mic/cam toggles" into sc-dev am: e25a1b3d91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14254683

Change-Id: Iaeb25064641c92a65d79a99f3df8a1465f43bd2d
 2021-05-19 18:23:41 +00:00
Steven Moreland
7624c40762 Merge "Parcel: document enforceInterface" into sc-dev am: f07675c46c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14631434

Change-Id: Id91f44ef9da8b1229c506b6008bfe7feebc7d589
 2021-05-19 18:22:56 +00:00
Mady Mellor
9f97f89342 Merge "Fix some sizes that weren't changing for font scale / display size`" into sc-dev 2021-05-19 18:18:34 +00:00
Rubin Xu
e25a1b3d91 Merge "Add device admin restrictions for mic/cam toggles" into sc-dev 2021-05-19 18:03:36 +00:00
Steven Moreland
f07675c46c Merge "Parcel: document enforceInterface" into sc-dev 2021-05-19 18:02:16 +00:00
Abel Tesfaye
e021b6e619 Merge "Add LatencyTracker for CameraAutoRotate in RotationResolverManagerPerUserService" into sc-dev am: 784886816d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14238091

Change-Id: Ic7b91a2351843bc5f658bc83e2101b29e09b25e8
 2021-05-19 17:39:45 +00:00
Kevin Chyn
c696d83ea5 Merge "Initialize mLastAcquire, and check against it in wasUserDetected" into sc-dev am: ab0c4fbc4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14629487

Change-Id: Icd60cb84ccf3a43a9c820a1aaacc2661e74963e9
 2021-05-19 17:39:17 +00:00
TreeHugger Robot
b711732ef0 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: Ib5d55a3d2712daf1d290b49ee346f1a22dadd5ca
 2021-05-19 17:38:54 +00:00
Abel Tesfaye
784886816d Merge "Add LatencyTracker for CameraAutoRotate in RotationResolverManagerPerUserService" into sc-dev 2021-05-19 17:38:51 +00:00
Kevin Chyn
ab0c4fbc4f Merge "Initialize mLastAcquire, and check against it in wasUserDetected" into sc-dev 2021-05-19 17:28:39 +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
80fc30382f 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: I132e48de616d97ad1c0983ebaaaf4a83dd343cf0
 2021-05-19 17:22:52 +00:00
Brad Ebinger
bd5ef43130 Merge "Clarify some UCE API docs" 2021-05-19 17:08:42 +00:00
Yi Jiang
af8ef20fe7 Merge "Adds unit tests for WOL." into sc-dev 2021-05-19 17:04:44 +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
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
365fb56a56 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev 2021-05-19 16:26:18 +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
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
Hai Zhang
0bd63263db Revert "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionCo..." 
Revert "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionCo..."

Revert "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionCo..."

Revert submission 14640417-revert-14608710-pc-account-permission-YZYJDZRTJD

Reason for revert: Reversion didn't fix test.
Reverted Changes:
I5b3cd130e:Revert "Remove GET_ACCOUNTS_PRIVILEGED from Permis...
I38aa53cc5:Revert "Remove GET_ACCOUNTS_PRIVILEGED from Permis...
Ibed0af2c7:Revert "Remove GET_ACCOUNTS_PRIVILEGED from Permis...

Bug: 185607880
Bug: 188643368
Change-Id: Iee9e3f4b01ad1f3d5285e712a70cf218886c8de9
 2021-05-19 16:18:31 +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
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
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
68aa35b03d Merge "Send network & security logging callbacks in foreground" into sc-dev 2021-05-19 15:34:31 +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