Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
755,185 Commits 3 Branches 0 Tags
44df60c3f9bb834d68391d83bd0159cd7c21ad2c
Commit Graph

755185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
44df60c3f9 Merge "Fall back when failing to load size restricted icon" into tm-dev 2022-03-29 23:33:39 +00:00
Antony Sargent
68eab3f162 Merge "Lock default display when it sleeps independent of global wakefulness" into tm-dev 2022-03-29 23:20:21 +00:00
Austin Borger
45081ab6a0 Merge changes from topics "b124224342", "change_procstate_flag" into tm-dev 
* changes:
  Add new onUidProcAdjChanged callback to be consumed by the camera service.
  Modify UidRecord.CHANGE_PROCSTATE such that it behaves like a bit mask.
 2022-03-29 21:52:36 +00:00
Tracy Zhou
c4b98636f4 Merge "Cover screen pinning logic around task bar" into tm-dev 2022-03-29 21:21:06 +00:00
Etienne Ruffieux
ab2d54cabe Merge changes from topic "api-review-result-receiver" am: b7de235729 am: 9fd8b3411c am: e238a492de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038904

Change-Id: I74c4b4dea4bc9c100f267550b06870acc44e1299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 21:18:54 +00:00
Etienne Ruffieux
9ab5b43644 [automerger skipped] [API Review] Replace ResultReceiver by Executor am: 8d4a9f8d72 am: 2d0b69cd5e am: 34d2b99779 -s ours 
am skip reason: Merged-In I5c6fc4780b41406dc41c26050a10768b7a2114df with SHA-1 67744d1582 is already in history

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

Change-Id: I032a59bcd09e0c4b044305d1d0ae0120399ae93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 21:18:39 +00:00
Etienne Ruffieux
e238a492de Merge changes from topic "api-review-result-receiver" am: b7de235729 am: 9fd8b3411c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038904

Change-Id: I1f4772fbc0aedb40d015e11a16672f627f50e4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 21:11:27 +00:00
Etienne Ruffieux
34d2b99779 [API Review] Replace ResultReceiver by Executor am: 8d4a9f8d72 am: 2d0b69cd5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019937

Change-Id: I04cdaaf291637eea9ed857c7e6c3c17da9b81275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 21:11:24 +00:00
TreeHugger Robot
93ac91554a Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90 am: 9d9976b68f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206575

Change-Id: I9c301bd9e347fedaa1a04ce8f2e50fda402ece4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 20:54:57 +00:00
Etienne Ruffieux
9fd8b3411c Merge changes from topic "api-review-result-receiver" am: b7de235729 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038904

Change-Id: Idddcd7bcbb10e30e477b6fd8e23ea33b2019353a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 20:53:05 +00:00
Etienne Ruffieux
2d0b69cd5e [API Review] Replace ResultReceiver by Executor am: 8d4a9f8d72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019937

Change-Id: I0ce280130dd45461a6c2012a030316bd2f2bb095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 20:53:00 +00:00
TreeHugger Robot
228a605dd2 Merge "Avoid unnecessary work." into tm-dev 2022-03-29 20:48:19 +00:00
Eric Biggers
daf36ca425 Merge "Log to EventLog on prepareUserStorage failure" into tm-dev 2022-03-29 20:43:41 +00:00
TreeHugger Robot
9d9976b68f Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206575

Change-Id: I472e4dc6a9b0ae0f8f76e2b620ec59e53aba0b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 20:39:43 +00:00
Etienne Ruffieux
b7de235729 Merge changes from topic "api-review-result-receiver" 
* changes:
  Added error method to interface Bluetooth stats
  [API Review] Replace ResultReceiver by Executor
 2022-03-29 20:36:29 +00:00
Matt Casey
3a9b1b828f Merge "Close clipboard text editor when text is copied" into tm-dev 2022-03-29 20:31:13 +00:00
TreeHugger Robot
f709e34b90 Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev 2022-03-29 20:19:40 +00:00
Allen Xu
d9fe67ca4a [automerger skipped] Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" am: 4797e99e5f am: 5d15fd1097 am: d6272afec7 -s ours 
am skip reason: Merged-In Idb564cf44d7d321b95cccb18798992e718f30da4 with SHA-1 d0a56a1c3d is already in history

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

Change-Id: I5cc2c23a90a279fe2a5a9cbdef771230618db4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 19:10:55 +00:00
Eric Biggers
7126988ee8 Merge changes Iccf50955,I17ab54dd am: 92ed348a6d am: 7d85933c4c am: fa29af8061 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2046823

Change-Id: Ic6ef33bfc157597a1b4d3790be621c36d3144c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 19:09:58 +00:00
Mark Renouf
b3729dc001 Merge changes from topics "presubmit-am-0adc4a89a1534fb8873a721309ac084a", "presubmit-am-f0e20c2f5d9d42f5b21d0cb6ae2e15cd" into tm-dev 
* changes:
  Removes 'mIsHeadlessSpringboardActivity'
  Remove 'startAsCallerImpl' refactoring relic
 2022-03-29 19:07:20 +00:00
Allen Xu
d6272afec7 Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" am: 4797e99e5f am: 5d15fd1097 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045704

Change-Id: I60e6bd5462b600f6bdd8bb7baa0d93efa637964c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 19:03:14 +00:00
Allen Xu
5d15fd1097 Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" am: 4797e99e5f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045704

Change-Id: I857a4660a339cb10ba5cca1c0860b2ce0b859fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:55:31 +00:00
Eric Biggers
fa29af8061 Merge changes Iccf50955,I17ab54dd am: 92ed348a6d am: 7d85933c4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2046823

Change-Id: I978a5e2e943154d876f868a6d682cf3d0ba3c2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:54:45 +00:00
Antony Sargent
4d9ded0369 Lock default display when it sleeps independent of global wakefulness 
When dealing with multiple PowerGroups, we calculate the global
wakefulness as the highest of any individual group. In the case where
a non-default PowerGroup (e.g. for a VirtualDisplay) is awake and the
default PowerGroup transitions from awake to asleep, we need to let
the PhoneWindowManager know so it can tell Keyguard to lock the
default display.

Fixes: 208229988
Test: atest PowerManagerServiceTest
Change-Id: Ib0fc4fdc30ca6f111e3c9d428a45bab5d403ad15
 2022-03-29 18:42:23 +00:00
Chavi Weingarten
8089e6f249 Merge "Force draw during a blast sync and disable rt animations" into tm-dev 2022-03-29 18:38:02 +00:00
Allen Xu
4797e99e5f Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" 2022-03-29 18:33:04 +00:00
Sarah Chin
d9ac8b2a49 Merge "Add support for RAT-based TCP buffer sizes" into tm-dev 2022-03-29 18:30:28 +00:00
Alex Johnston
f353ff4dc4 Merge "Update all usb ports in enableUsbDataSignal" into tm-dev 2022-03-29 18:24:54 +00:00
Iavor-Valentin Iftime
9d0392bc04 Merge "Add support for HW privacy toggles in sensor unblock dialog" into tm-dev 2022-03-29 18:22:44 +00:00
Bill Yi
bdfaf8b552 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 18:22:20 +00:00
Eric Biggers
7d85933c4c Merge changes Iccf50955,I17ab54dd am: 92ed348a6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2046823

Change-Id: Ibf8a30f12f592ff5d58c9c5c28bad62ce583f4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:17:37 +00:00
Rob Carr
0aa52e1be8 Merge "Async BLAST Sync[4/N]: Replace draw handlers with seqId" into tm-dev 2022-03-29 18:14:31 +00:00
Pinyao Ting
7320750e8d Merge "Refrain from choking sysram due to excessive onShortcutChanged callbacks" into tm-dev 2022-03-29 18:07:45 +00:00
Eric Biggers
92ed348a6d Merge changes Iccf50955,I17ab54dd 
* changes:
  Stop checking StorageManager.inCryptKeeperBounce() in BootReceiver
  Stop checking StorageManager.inCryptKeeperBounce() in DPM
 2022-03-29 17:55:16 +00:00
TreeHugger Robot
82102397ec Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 17:54:35 +00:00
TreeHugger Robot
5af77f1672 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 17:52:12 +00:00
TreeHugger Robot
c87fc468eb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 17:52:05 +00:00
Oscar Shu
1834a4207f Merge "Remove MANAGE_WIFI_AUTO_JOIN" into tm-dev 2022-03-29 17:47:00 +00:00
Andrea Ambu
6782f93142 Merge "speech: Remove @Deprecated fields after rename" into tm-dev 2022-03-29 16:53:55 +00:00
Sharon Su
acf4d5a89d Merge "Change android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION to signature| privileged Test: cts test Bug: 213238425 Change-Id: Iacaec0904a1d1c14ba8b0ec8f3871376ff33f01c" into tm-dev 2022-03-29 16:41:57 +00:00
Kweku Adams
c9a5e428b3 Avoid unnecessary work. 
If the pending queue is empty, then we don't need to do all the work of
determining job assignments.

Bug: 141645789
Test: Android builds
Change-Id: I3dfad0ea128580ba7e924b332464b807eb2c403f
 2022-03-29 16:08:45 +00:00
Alex Johnston
0effa34013 Merge "Remove unused lost mode permission" into tm-dev 2022-03-29 15:51:16 +00:00
TreeHugger Robot
05511ff79a [automerger skipped] Merge "Limit broadcast by user" into sc-v2-dev am: c0b5023cb2 -s ours am: cc0ca80304 -s ours 
am skip reason: Merged-In Ie8d5d008141e69febe5216f49b127222d2bcb8cc with SHA-1 89f6161d7a is already in history

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

Change-Id: I16e8b2df004cc9baf6af78c05531b51398a29cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:49:22 +00:00
TreeHugger Robot
91d94eab1d [automerger skipped] Merge changes from topic "presubmit-am-ac1fefcfb8ff4afa9a12b9c99a31f5fa" into sc-v2-dev-plus-aosp am: f3c6b564e0 -s ours 
am skip reason: Merged-In Ie8d5d008141e69febe5216f49b127222d2bcb8cc with SHA-1 8ea87a6877 is already in history

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

Change-Id: I68fab04f43c168d45e7aae99d145e587eb5addc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:47:17 +00:00
Presubmit Automerger Backend
21ac6f7fef [automerger skipped] [automerge] Limit broadcast by user 2p: 89f6161d7a am: 304fd42898 -s ours 
am skip reason: Merged-In Ie8d5d008141e69febe5216f49b127222d2bcb8cc with SHA-1 8ea87a6877 is already in history

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

Change-Id: I81df39111aac0840f7a0c094baf6e477e8ee1954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:47:05 +00:00
Alex Johnston
4879dca57a Remove unused lost mode permission 
Bug: 226945080
Test: NA
Change-Id: I339b6894b3a9e32a3d644a06e4ebc3a0f7f98a05
 2022-03-29 15:36:49 +00:00
Treehugger Robot
c740e6c9ff [automerger skipped] Merge "Rename updateFirewallRule to setUidFirewallRule" am: 39ae5bac21 am: fa604b4fbe am: cbfdb8fd4b -s ours 
am skip reason: Merged-In I0b7427521479271b34aed307f17a6e2225fb3076 with SHA-1 c60b36d705 is already in history

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

Change-Id: I643adc1bf2938aec0850221b232fa99f1cd9445a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:35:13 +00:00
Aurimas Liutikas
f5b7e1f67d Merge "Add siyamed@ to android/view OWNERS" am: 30cbfdba0a am: 98ce07baf9 am: 500742b6ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2046963

Change-Id: I1cef4b1bff1d0db2e4a8ecf0949da1e147ec3e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:34:33 +00:00
Jooyung Han
f0759689a9 Merge "Fix Parcel.writeFixedArray javadoc" am: 3337082dec am: 13cd8e4f59 am: bfcb72d582 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045075

Change-Id: Id8339ca4e794b4816f4ba8d84f06fb579dbfcc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:33:50 +00:00
Treehugger Robot
83dcca2657 [automerger skipped] Merge changes from topics "MEP_addPortIndex", "mep_switchToSubscription" am: 2773d2034f am: 268dccdb7a am: d1ab424dae -s ours 
am skip reason: Merged-In I6a802ea0c85ff749b09745f629bc1a80f30ed3b9 with SHA-1 9adebdf38d is already in history

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

Change-Id: I2d5e12f9775a159f14fb2ebd47c88f832b32abc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:33:19 +00:00