Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
757,808 Commits 3 Branches 0 Tags
dbc7e4a31e708d01c19dbd78fb84f7f5a16205f8
Commit Graph

757808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kathy Chen
dbc7e4a31e Fix a typo in AbstractMasterSystemService. 
Test: make and flash device
Change-Id: I4757dd904748ffd6d6b1f794d1154d58dfce4c1a
 2022-04-21 20:05:02 +00:00
Benedict Wong
b45b8bdc94 Merge "Update the constants to use Environment" am: 99e23bcc0b am: 229797193a am: f19bebfcf5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2064568

Change-Id: I2f77a8b0903bc8f33ed41f8ae7e4f63c4f7d149d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:23:37 +00:00
Sudheer Shanka
cd50298c75 [automerger skipped] Merge changes Iad41fa42,Ie37173d0,Ib923eafb,I9bff481a,I631f5e01, ... am: cc7dec54ab am: 62afa55bb9 am: c622b5289b -s ours 
am skip reason: Merged-In Iad41fa423844dee975c5063c03784e44a68bbfcd with SHA-1 745698b4da is already in history

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

Change-Id: I1226da3529541663b3ca6b1316095946a7ddb2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:22:52 +00:00
Sudheer Shanka
4300ee2573 [automerger skipped] Inform Application thread to block for network rules to be updated. am: 3bad67bf01 am: 11ca5138aa am: 9eaceb337c -s ours 
am skip reason: Merged-In Ie37173d0d3f4034a74b834550920530166cd4201 with SHA-1 ffa1d57dae is already in history

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

Change-Id: Ie11e777eecf2d126105ac8e400b986f9f6000962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:22:23 +00:00
Sudheer Shanka
3ba29a1af3 [automerger skipped] Update getUidProcessState to consider mPendingStartActivityUids. am: 46ddc965b9 am: 710fdef571 am: 54fd123689 -s ours 
am skip reason: Merged-In Ib923eafb35c3e315e49dc7a896b5d3dcb8c6f896 with SHA-1 ed2846b793 is already in history

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

Change-Id: I70dd8c9ca32a65f0cc4ea8a9a725693706a55d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:21:55 +00:00
Sudheer Shanka
9a53b0add1 [automerger skipped] Inform AMS about the uid blocked reasons. am: eb5e04aeca am: 7ee9ee6a32 am: f56982724b -s ours 
am skip reason: Merged-In I9bff481a0026fb57af8dbee580e617c8410f9ebe with SHA-1 73380fec52 is already in history

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

Change-Id: I0ae0b8ea2dc2835efdd228ae637636d8d63e5bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:21:44 +00:00
Sudheer Shanka
b5ca9fb068 [automerger skipped] Ignore older UID state change callbacks in NPMS. am: efa4f74236 am: 2a4f9d6db5 am: b013bf1bb0 -s ours 
am skip reason: Merged-In I631f5e01f6627916a96c930c22849a1d11eab636 with SHA-1 b57c865855 is already in history

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

Change-Id: Idd52b7a062a7b587d3ba6d673a8a50c7d0b34420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:21:30 +00:00
Sudheer Shanka
72fb5fb243 [automerger skipped] Inform NPMS about the app coming to the TOP state early. am: 3d9f5e63c1 am: 6216322403 am: 250fae6505 -s ours 
am skip reason: Merged-In I5d582618652cead179c419f7fe084283dd89d514 with SHA-1 e69f7fdbb6 is already in history

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

Change-Id: I08fc99c30777f8981315b54c06adbc51ce875dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:21:19 +00:00
Sudheer Shanka
e60c3ae325 [automerger skipped] Optimize the handling of disabling doze state. am: 28d4a8f2af am: 15bcb7c340 am: 6c1afe25c5 -s ours 
am skip reason: Merged-In I53e40af53aa00ff493e8e5050908220ae4dad729 with SHA-1 b5df9c503a is already in history

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

Change-Id: I11814eed0d76015861f48755baf3b5da1dde55da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:21:08 +00:00
Sudheer Shanka
ac64418f2f [automerger skipped] Fix the arguments order to postBlockedReasonsChangedMsg. am: 63a7d711c7 am: 614b4659e1 am: cc4f13f43d -s ours 
am skip reason: Merged-In I1977034aa190b67de96d84d694c6546fd9318e79 with SHA-1 a2333d1b7a is already in history

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

Change-Id: I9008aa4f447ff96db861d8f28ae0717c7a944df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:20:57 +00:00
Sudheer Shanka
0dfa0e78f4 [automerger skipped] Avoid checking for idle state when the app is in top state. am: 99b5c0cbf6 am: 595316feff am: 665f74cdd8 -s ours 
am skip reason: Merged-In I5648db595d2fd10a151da13e472fd905bcafe182 with SHA-1 12e997720b is already in history

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

Change-Id: I287de141417dd8934e149b4b471f8d1d7edb240e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:20:43 +00:00
Sudheer Shanka
8287d226ae [automerger skipped] Update network rules for only uids that are installed. am: c3580425a7 am: b8ea68c299 am: 1906fd1b2f -s ours 
am skip reason: Merged-In I3d5327bf4acd9c043483ace7b89576801b9e4ef1 with SHA-1 a6e49349d8 is already in history

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

Change-Id: Id3bd6430d270e4deee7076d40b365aa7b6c8ebfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:20:29 +00:00
Sudheer Shanka
426bf91b0b [automerger skipped] Fix logs in NetworkPolicyManagerService. am: fa63f4448e am: 745fbfce8a am: 9e09070091 -s ours 
am skip reason: Merged-In Iacb78bbf1070a0a822110f961e0240eb10c42bf2 with SHA-1 82850c2c75 is already in history

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

Change-Id: I0cc38ad4d26a3b089f424b4552dbc8255cd92347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:20:17 +00:00
Sudheer Shanka
d25d451af3 [automerger skipped] Guard mUidBlockedState with a separate lock. am: 6e0d64b95a am: 23aaa83ced am: 63966a3d6a -s ours 
am skip reason: Merged-In I6a913742647577256c9281dd8ebf4aa5422a49ee with SHA-1 8287585b81 is already in history

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

Change-Id: Ibfa52f8de8bd392bb7405e5f1a2263d604dcc17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:19:46 +00:00
Martijn Coenen
4052fa3810 [automerger skipped] Add SDK sandbox UIDs to network policy. am: d25240eb25 am: 2e36bb8ed3 am: cefef44af1 -s ours 
am skip reason: Merged-In Iaa2283808071d285953a0de3ed018472a67a1510 with SHA-1 f38bbca78e is already in history

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

Change-Id: Id8ecdbbcaae7ca74dc085f4ed2ce240a0e9d7090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:19:28 +00:00
Sudheer Shanka
f42fba0baa [automerger skipped] Add some debugs to diagnose test failure. am: a54743a270 am: c82359bc7e am: 93dfc72813 -s ours 
am skip reason: Merged-In I29d117a20905c065e50a21591a763fdadd8d2a7b with SHA-1 362b52cf13 is already in history

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

Change-Id: Idbbc234945eaef25a4ca80dd6e9accf85967b491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:19:07 +00:00
Varun Shah
11bf501d23 Merge "Fix swapped backup/heavy oom adj labels" am: e816d004ad am: 66243c935d am: 391b7b41f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062029

Change-Id: I759a110bee24e5c96db0c85b308ea26420a93caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:16:48 +00:00
Kweku Adams
b50303cb82 Merge "BatteryStatsService: Fix wrong arguments passed to noteBluetoothScanStoppedFromSourceLocked." am: 97f4c6172c am: 295fde95ff am: 9326553211 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063308

Change-Id: I5335b5fc61a39e7dfc6058f1f2e8778a041c5d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:15:58 +00:00
Chiachang Wang
60e060a4fa Merge "Support Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: a2ec01c7a1 am: b241c0a1af am: 050de9ffe0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062248

Change-Id: Id504e6f0019cf206855b7d9cf9f262a760b5f136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:15:25 +00:00
Varun Shah
a8a543873f Merge "Update OWNERS file." am: 2c630f8884 am: 958f15fcd0 am: 34d29bd80c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2064689

Change-Id: Ic991ecd272ff5fada00339a77db56461969aac29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:14:34 +00:00
Steven Moreland
52710c239c [automerger skipped] Merge "Implement getInterfaceHash/Version (omapi)" into sc-v2-dev-plus-aosp am: 4b46cc19e2 -s ours 
am skip reason: Merged-In I274f847ed8156acd0c4b288e306fcab2d380bcd5 with SHA-1 df1fa99b01 is already in history

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

Change-Id: I736f732de0443a1616a6ee65680a806448525de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:13:40 +00:00
Steven Moreland
7a0b98769b [automerger skipped] Implement getInterfaceHash/Version (omapi) am: 32d2c1bf21 -s ours 
am skip reason: Merged-In I274f847ed8156acd0c4b288e306fcab2d380bcd5 with SHA-1 df1fa99b01 is already in history

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

Change-Id: Ia9b8db331b79b60e883cc39b8887d1ad4274ac8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:13:13 +00:00
Steven Moreland
dea664a15f [automerger skipped] Merge "Implement getInterfaceHash/Version (health)" into sc-v2-dev-plus-aosp am: 94db86b8a3 -s ours 
am skip reason: Merged-In I01dda85890dae59082067e4b38c0f50d493cd22d with SHA-1 ec55bbd8e2 is already in history

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

Change-Id: I54000b1858df681fb84e182dca1a541e39678739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:12:58 +00:00
Steven Moreland
ebf9e509d8 [automerger skipped] Implement getInterfaceHash/Version (health) am: 04268342c9 -s ours 
am skip reason: Merged-In I01dda85890dae59082067e4b38c0f50d493cd22d with SHA-1 ec55bbd8e2 is already in history

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

Change-Id: Id917c8f3c41b3dad38b0e421f900772ef7e10ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 18:12:29 +00:00
Sally Qi
e3ebb21b3f Merge "Fix Photos crash when open 10-bit HDR videos" into tm-dev 2022-04-19 17:58:27 +00:00
Nick Chameyev
6da0c2fce2 Merge "Finish unfold transition when screen turns on after half-folded" into tm-dev 2022-04-19 17:10:27 +00:00
Mady Mellor
ef1cc8850f Merge "Collapse bubbles when drag and drop is initiated" into tm-dev 2022-04-19 17:08:36 +00:00
Jay Aliomer
bfab17072d Merge "Properly apply launch animation params" into tm-dev 2022-04-19 16:29:35 +00:00
Bernardo Rufino
c9bf2574b4 Merge "Block trampolines for browsers w/ targetSdk >= T" into tm-dev 2022-04-19 15:58:02 +00:00
TreeHugger Robot
a9b6e8c3a0 Merge "Remove co-ex logic for blocking face help msgs" into tm-dev 2022-04-19 15:56:31 +00:00
Rob Carr
23e043e977 Merge "SurfaceControlViewHost: Allow updating of WindowContext used for SCVH" into tm-dev 2022-04-19 15:47:26 +00:00
Milton Wu
b9a2502abd Merge "Passing info to RoundedCornerResDelegate directly" into tm-dev 2022-04-19 15:26:42 +00:00
Varun Shah
3afb3e1922 Merge "Update condition to elevate a sync adapter to ACTIVE." into tm-dev 2022-04-19 15:20:38 +00:00
TreeHugger Robot
6687030f98 Merge "Extend the timeout of update state" into tm-dev 2022-04-19 15:08:28 +00:00
Yuri Lin
f54740a66d Merge "Update string to say "Starting in Android 13" rather than just "In Android 13"" into tm-dev 2022-04-19 15:08:12 +00:00
Shan Huang
a81f250b2a Merge "Revert "Migrate InputMethodService to use OnBackInvokedDispatcher"" into tm-dev 2022-04-19 14:53:50 +00:00
Aaron Liu
f08f61e9f9 Merge "[User Switcher] Finish activity when switch user" into tm-dev 2022-04-19 14:41:30 +00:00
Aaron Liu
a20c177e33 Merge "[Scrim] Remove notif scrim flicker on unlock" into tm-dev 2022-04-19 14:41:17 +00:00
Milton Wu
890c7579ae Merge "Redraw ScreenDecorations only if rotation changed" into tm-dev 2022-04-19 14:36:20 +00:00
TreeHugger Robot
b15f71e273 Merge "Respect disable flag in LargeScreenHeader" into tm-dev 2022-04-19 13:46:28 +00:00
Peter Li
f11f969973 Extend the timeout of update state 
Bug: 207717787
Change-Id: Iaeea0917ce4aa363cd5889379580aa77c05b43bf
Test: atest HotwordDetectionServiceBasicTest
 2022-04-19 17:37:19 +08:00
Christian Göllner
9bfd60ab82 Disable depth effect during split-shade expansion 
According to the motion spec for split-shade, there should be no depth effect.

Fixes: 228022043
Test: Manually + NotificationShadeDepthControllerTest.kt
Change-Id: I1b908e17b3084f94578973d53993b47d9ad22ebb
 2022-04-19 11:18:14 +02:00
Milton Wu
cc79f24c49 Redraw ScreenDecorations only if rotation changed 
In ScreenDecorations.onConfigurationChanged(), only redraw OverlayWindow
views when rotation is changed

Bug: 229549809
Test: atest ScreenDecorationsTest
Change-Id: Ic596c065ac9f962de94277be858fdb2ab96bc833
 2022-04-19 17:16:10 +08:00
TreeHugger Robot
ea91f5bb91 Merge "Nest SystemUI alert dialogs in NestedScrollLayout" into tm-dev 2022-04-19 08:37:51 +00:00
SongFerng Wang
6d7970c9cd Merge "[LE_Broadcast] Add more APIs for the broadcast profile" into tm-dev 2022-04-19 08:01:41 +00:00
Nicolò Mazzucato
18badb64b8 Merge "Add DeviceTypeRule to filter tests only for large screens or foldable" into tm-dev 2022-04-19 07:47:37 +00:00
TreeHugger Robot
d423d78014 Merge "Assert correct nav bar visibility in overview" into tm-dev 2022-04-19 07:06:19 +00:00
Milton Wu
e9440ab1a0 Passing info to RoundedCornerResDelegate directly 
1. Move rounded corners tint color into RoundedCornerResDelegate, and
   RoundedCornerDecorProviderImpl uses it to draw image.
2. After display changed, pass display unique id to
   RoundedCornerResDelegate directly.
3. Cache tuning size inside RoundedCornerResDelegate

Bug: 229234279
Bug: 218951516
Test: atest ScreenDecorationsTest PrivacyDotDecorProviderFactoryTest \
      RoundedCornerDecorProviderFactoryTest RoundedCornerResDelegateTest
Change-Id: I7edd16db06f6023a3c3dfd10b430a5002b9ee942
 2022-04-19 06:41:01 +00:00
Sarah Chin
174c5ebb78 Merge "Don't send null data call list response" into tm-dev 2022-04-19 05:34:18 +00:00
TreeHugger Robot
60079c86ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e45716b635 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a3ceba0f58e1a7e9e4baeb5f1f707ac7b24aaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 05:31:26 +00:00