Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
730,375 Commits 3 Branches 0 Tags
4f7ca41f6f2d9b2fc8a306e4a28da25ecfbec8d9
Commit Graph

730375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
4f7ca41f6f Go to sleep on fold for foldable devices. 
Allow configuration of foldable states to indicate the device
should sleep when entering certain states.

Test: Check that device still wakes up on unfold, and sleeps on fold.
Bug: 180154690
Change-Id: I179d93ec506deee7e9da7d9190934c52a0bc188f
 2021-11-10 14:26:16 +00:00
Nicolas Geoffray
e43cf93ec4 Merge "Add a README to frameworks/base/config." am: ec2aafa614 am: 846984a499 am: 2616a44c26 am: 72da11e20b am: 6579c3be29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885634

Change-Id: Ib8b5889ee4534c69a3506f57351ecea62f839d1d
 2021-11-10 13:52:03 +00:00
Nicolas Geoffray
6579c3be29 Merge "Add a README to frameworks/base/config." am: ec2aafa614 am: 846984a499 am: 2616a44c26 am: 72da11e20b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885634

Change-Id: Idf4d2813c845e62b3273c10bf948632419c21ca3
 2021-11-10 13:39:50 +00:00
Nicolas Geoffray
72da11e20b Merge "Add a README to frameworks/base/config." am: ec2aafa614 am: 846984a499 am: 2616a44c26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885634

Change-Id: Idc3c7eef80fc8ff7e42752475de045ccb81bfc68
 2021-11-10 13:22:45 +00:00
Nicolas Geoffray
2616a44c26 Merge "Add a README to frameworks/base/config." am: ec2aafa614 am: 846984a499 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885634

Change-Id: Ie75dad1337cde1ccb11951e212f3a6da1808f849
 2021-11-10 13:04:42 +00:00
Nicolas Geoffray
846984a499 Merge "Add a README to frameworks/base/config." am: ec2aafa614 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885634

Change-Id: Ibf7402036c0a58ba225cd45cf397dc8a913d5363
 2021-11-10 12:53:34 +00:00
Nicolas Geoffray
ec2aafa614 Merge "Add a README to frameworks/base/config." 2021-11-10 12:33:34 +00:00
Louis Chang
ab1c014ea3 Merge "Allows running TaskFragment related hierarchy op in lock task mode" into sc-v2-dev am: d942230710 am: 17102b5e3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16182643

Change-Id: I5a4ce8b84439e2cb8138468d3a120f137407cc4e
 2021-11-10 11:29:56 +00:00
Oliver Woodman
955df669c4 Merge changes from topic "grouped-volume-tweak" into sc-v2-dev am: f256468516 am: e180aad3a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214372

Change-Id: I3451bb899abc4ab19ee8fa3829c969fcc6771ce5
 2021-11-10 11:29:29 +00:00
Oliver Woodman
ca93164397 Tweak volume adjustment rules am: aa9dc925f8 am: e49fa1c0be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214371

Change-Id: Idf45273d3b7308bea1a0222693128333e73a6874
 2021-11-10 11:28:52 +00:00
Ryan Lin
249b619baf Merge "Support individual magnification mode for each display" 2021-11-10 11:28:33 +00:00
Louis Chang
17102b5e3f Merge "Allows running TaskFragment related hierarchy op in lock task mode" into sc-v2-dev am: d942230710 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16182643

Change-Id: I293cd5f53efab188b7953d80f9248af8d92e3b39
 2021-11-10 11:05:51 +00:00
Oliver Woodman
e180aad3a4 Merge changes from topic "grouped-volume-tweak" into sc-v2-dev am: f256468516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214372

Change-Id: Ifb352d0b8e2cb8d8f309b96b5340d8de689e799c
 2021-11-10 11:05:05 +00:00
Oliver Woodman
e49fa1c0be Tweak volume adjustment rules am: aa9dc925f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214371

Change-Id: I7a7c68d7ec91a8dd0043dcdaee2c7e8092cd27f2
 2021-11-10 11:04:53 +00:00
Chiachang Wang
a3b8b6d634 Merge "Update test to adopt new API for check network support" am: 04f4216496 am: 3a43a0dc48 am: 064c7fbb34 am: 9848166715 am: 1efb06ec36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886878

Change-Id: I7aa12b4b707a56da9125b920bd92ef95c8199af0
 2021-11-10 10:51:58 +00:00
Louis Chang
d942230710 Merge "Allows running TaskFragment related hierarchy op in lock task mode" into sc-v2-dev 2021-11-10 10:51:38 +00:00
Oliver Woodman
f256468516 Merge changes from topic "grouped-volume-tweak" into sc-v2-dev 
* changes:
  Re-enable volume control for non-grouped devices
  Tweak volume adjustment rules
 2021-11-10 10:48:01 +00:00
Chiachang Wang
1efb06ec36 Merge "Update test to adopt new API for check network support" am: 04f4216496 am: 3a43a0dc48 am: 064c7fbb34 am: 9848166715 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886878

Change-Id: I5905358fbdea3607f97e9840c82caa7e15814962
 2021-11-10 10:33:35 +00:00
Chiachang Wang
9848166715 Merge "Update test to adopt new API for check network support" am: 04f4216496 am: 3a43a0dc48 am: 064c7fbb34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886878

Change-Id: I3c4ad12f75e849ae36bf1778411621dd74b415a1
 2021-11-10 10:22:16 +00:00
Chiachang Wang
064c7fbb34 Merge "Update test to adopt new API for check network support" am: 04f4216496 am: 3a43a0dc48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886878

Change-Id: Ia44da16b8c5844c5e6e34f8661ef39def5d96175
 2021-11-10 10:10:46 +00:00
Chiachang Wang
3a43a0dc48 Merge "Update test to adopt new API for check network support" am: 04f4216496 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886878

Change-Id: Ie1c8b049e601138bba43b00787c543e2231b2149
 2021-11-10 09:51:27 +00:00
Nicolas Geoffray
83eb7d1759 Add a README to frameworks/base/config. 
Bug: 174746397
Test: N/A
Change-Id: Ie1131c9ff818d1a5308774eb51337f8200a85d79
 2021-11-10 09:36:47 +00:00
Chiachang Wang
04f4216496 Merge "Update test to adopt new API for check network support" 2021-11-10 09:32:58 +00:00
Xiao Ma
76fad38e3d [automerger skipped] Merge "Enable tethering namespace accessible in Android native level." am: 1f1155ea78 am: 21b092ae14 am: b7a0bd4430 am: 48093d551c am: 8326f73cda -s ours 
am skip reason: Merged-In If840c79001134d2003cb6f0e03d38b4b4055fb54 with SHA-1 2c9d35b5b3 is already in history

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

Change-Id: I0e2cf16e1412daa6c30bcd247dc43e149fb1d019
 2021-11-10 09:31:32 +00:00
Xiao Ma
8326f73cda Merge "Enable tethering namespace accessible in Android native level." am: 1f1155ea78 am: 21b092ae14 am: b7a0bd4430 am: 48093d551c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873955

Change-Id: Idac2006e2c7082f96d0288e7d6dcef42c37eeeca
 2021-11-10 09:19:15 +00:00
Pratyush More
e0eb65ed7b Merge changes I1bada812,Ia50e462d 
* changes:
  Automatically run LocaleManager CTS cases for relevant changes.
  Automatically run LocaleManager CTS cases for relevant changes.
 2021-11-10 09:04:32 +00:00
Xiao Ma
48093d551c Merge "Enable tethering namespace accessible in Android native level." am: 1f1155ea78 am: 21b092ae14 am: b7a0bd4430 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873955

Change-Id: Iba983ebbd4025b18115d6f6c46fa2276b5d306e4
 2021-11-10 09:00:30 +00:00
Xiao Ma
b7a0bd4430 Merge "Enable tethering namespace accessible in Android native level." am: 1f1155ea78 am: 21b092ae14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873955

Change-Id: Ie2bd89cc69a8d3686f3b4a762a22e84f3be58403
 2021-11-10 08:37:19 +00:00
TreeHugger Robot
98c7b477c9 [automerger skipped] Merge "Fix preserving app links user selection on package update" into sc-v2-dev am: bf3446ce37 am: ff7f255ce3 -s ours 
am skip reason: Merged-In I2c864a34f356e32948cbc4e5d249e12c691a5726 with SHA-1 8f68089dac is already in history

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

Change-Id: I6d22071a6e1e3aba092970fbfb21e88a634bfd69
 2021-11-10 08:36:24 +00:00
TreeHugger Robot
ff7f255ce3 Merge "Fix preserving app links user selection on package update" into sc-v2-dev am: bf3446ce37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16216167

Change-Id: I0c4af1c01c4057f742f0df77e2e8c8d23eb753d3
 2021-11-10 08:32:18 +00:00
TreeHugger Robot
bf3446ce37 Merge "Fix preserving app links user selection on package update" into sc-v2-dev 2021-11-10 08:28:25 +00:00
Xiao Ma
21b092ae14 Merge "Enable tethering namespace accessible in Android native level." am: 1f1155ea78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873955

Change-Id: I63f66dcd5d714647a76f5eaccb887becc0af1059
 2021-11-10 08:20:48 +00:00
TreeHugger Robot
1c36aa60c8 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 5b210b31f0 am: c1b7e5e91f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81982655b8644c04f6327cd5ac711d6f99f46041
 2021-11-10 08:17:32 +00:00
Charles Chen
6de31e28e1 [automerger skipped] [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 71b2172abc am: 13f7c9ec32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I094dc98ae222e8ebeed7f3a11157c237aad907ca
 2021-11-10 08:17:20 +00:00
Siarhei Vishniakou
20438e9ea2 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: a0a4b2a294 -s ours am: befb36682b -s ours 
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history

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

Change-Id: Ibbff8d12ed0f210bff2577aab88fcd9dc911efa3
 2021-11-10 08:16:50 +00:00
Automerger Merge Worker
42563099a8 Merge "Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 8156e54a86" into sc-v2-dev-plus-aosp am: fbb3ef486d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: I72fd13432edf3f893bbc9e3b6334694807e9ce11
 2021-11-10 08:16:10 +00:00
Siarhei Vishniakou
b629787452 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: 090c357efe -s ours am: c047f9bf98 -s ours am: 5eabfb340b -s ours 
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history

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

Change-Id: Ib149c3fdf628419a16e94afe5f62dbf08e640f97
 2021-11-10 08:14:25 +00:00
Siarhei Vishniakou
1823ebdd7e [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: 6cfb9c4636 -s ours am: 47f238829f -s ours 
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history

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

Change-Id: Iae2a3dda56c4bfa61c6566faa91f7493b23cc716
 2021-11-10 08:14:09 +00:00
Wei Sheng Shih
8139a55ddd Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 46c778cde8 am: 6b3fd0c6cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: I704a2e2f0902f9fe11e6aa21700ae479bee1f8a2
 2021-11-10 08:13:14 +00:00
Xiao Ma
1f1155ea78 Merge "Enable tethering namespace accessible in Android native level." 2021-11-10 08:05:59 +00:00
Chiachang Wang
15595b76f6 Update test to adopt new API for check network support 
The isAvailable() in AbstractSimStatusImeiInfoPreferenceController
refers to Utils.isWifiOnly() which was updated in the modulization
work to refer TelephonyManager.isDataCapable(). The test here
should mock the data capable value instead of the connectivity one.

Update the usage accordingly to fix the broken test.

Test: make RunSettingsLibRoboTests \
      ROBOTEST_FILTER=SimStatusImeiInfoPreferenceControllerTest
Bug: 205788196
Change-Id: I79f6dad54cdcb1c506355a43b5c2030c93af96c8
 2021-11-10 16:01:55 +08:00
TreeHugger Robot
c1b7e5e91f Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 5b210b31f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879397

Change-Id: I4988ed358c9a7d4d7332027151843e867e392164
 2021-11-10 07:56:47 +00:00
Charles Chen
13f7c9ec32 [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 71b2172abc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879397

Change-Id: I722c5a2fd21c0d0969c849650b477e0105f7a1b2
 2021-11-10 07:56:38 +00:00
Siarhei Vishniakou
befb36682b [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: a0a4b2a294 -s ours 
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history

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

Change-Id: I67abf000e7d6851f4fc879c99e12c74ea58ae7d3
 2021-11-10 07:56:27 +00:00
Automerger Merge Worker
fbb3ef486d Merge "Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 8156e54a86" into sc-v2-dev-plus-aosp 2021-11-10 07:56:16 +00:00
Siarhei Vishniakou
5eabfb340b [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: 090c357efe -s ours am: c047f9bf98 -s ours 
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history

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

Change-Id: I11d2f19d885fc8222de383a8ade0ed62f9e9d752
 2021-11-10 07:56:10 +00:00
Siarhei Vishniakou
47f238829f [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: db96b08d15 -s ours am: 6cfb9c4636 -s ours 
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history

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

Change-Id: I3facfa35e04091d805fcb9b1a41e92e6f505e256
 2021-11-10 07:56:04 +00:00
Wei Sheng Shih
4251d6dde4 Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 8156e54a86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: Icdfc648174b930b4f278bff06e8ce4f16c03ee26
 2021-11-10 07:56:04 +00:00
Wei Sheng Shih
6b3fd0c6cb Merge "setTurnScreenOn can only used as wakeup" into sc-qpr1-dev am: 16e78720c9 am: 46c778cde8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211938

Change-Id: Ib2d9a9f1c9be9f232839b55a4eaa8718bbdc3f0d
 2021-11-10 07:55:47 +00:00
Siarhei Vishniakou
3cb2509ef7 [automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: 6bdebc2a7d -s ours am: e1a2ccd0e5 -s ours am: 72a28c9d02 -s ours 
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 0657e19940 is already in history

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

Change-Id: I5856ed6e5fd91b1b06e50017c35f371ed4552820
 2021-11-10 07:55:14 +00:00