Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
641,676 Commits 3 Branches 0 Tags
68a06f5b23f58141ca3a31dfd728b392cb780400
Commit Graph

641676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
68a06f5b23 Merge "Avoid sysfs name clashes." into sc-dev am: 6f7a5b8eb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14471783

Change-Id: I275df451bfc400dd45035097d3ca8b008b22b468
 2021-05-08 21:31:54 +00:00
TreeHugger Robot
6f7a5b8eb0 Merge "Avoid sysfs name clashes." into sc-dev 2021-05-08 21:11:13 +00:00
Jing Ji
38f097a480 Merge "Fix issue with acquiring singleton content provider from another user" into sc-dev am: a575e65fdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14463094

Change-Id: I7d406948f0e2c212e3658498fdab3bb5768e2cbd
 2021-05-08 20:38:06 +00:00
Jing Ji
a575e65fdb Merge "Fix issue with acquiring singleton content provider from another user" into sc-dev 2021-05-08 20:21:29 +00:00
TreeHugger Robot
ecb301c33f Merge "Move mForceDeniedNapps check into synchronized block" into sc-dev am: 0bc505c093 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14456641

Change-Id: I0588247bb936232798174ae4d5f4a60d74870ced
 2021-05-08 20:14:01 +00:00
TreeHugger Robot
0bc505c093 Merge "Move mForceDeniedNapps check into synchronized block" into sc-dev 2021-05-08 19:59:13 +00:00
Baligh Uddin
6bebe24d7f Merge "Revert "Only update default home when the preferred home activity is modified."" into sc-dev am: 7e7c76c8a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14477457

Change-Id: I0437279945a945243839c4b8d2d69d61b2ac76af
 2021-05-08 16:54:56 +00:00
Baligh Uddin
7e7c76c8a8 Merge "Revert "Only update default home when the preferred home activity is modified."" into sc-dev 2021-05-08 16:30:38 +00:00
Yu-Han Yang
f0814d24f6 Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: 83a305a089 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443641

Change-Id: I7bc1c47f40b45dcf0162e5700bcc95a26803436b
 2021-05-08 16:19:18 +00:00
Yu-Han Yang
83a305a089 Merge "Revert "Remove dynamic location settings footer"" into sc-dev 2021-05-08 15:58:10 +00:00
Yu-Han Yang
7b1f58ce2d Revert "Remove dynamic location settings footer" 
Revert "Remove dynamic location settings footer"

Revert submission 13809184-location_footer

Reason for revert: b/187211885

Reverted Changes:
Iaf14044e0:Remove dynamic location settings footer
Ifa6468b11:Remove dynamic location settings footer
If3ab49241:Remove dynamic location settings footer

Bug: 187211885

Change-Id: Ib53c42b3583fd93c87d21feb9882f3431b133d40
 2021-05-08 15:57:26 +00:00
Hai Zhang
d30570e29a Revert "Only update default home when the preferred home activity is modified." 
This reverts commit cac5c6812a.

Reason for revert: Broke build
Bug: 178191941

Change-Id: Idd8d4e3421fe2f9df1165974359fc2f4294a9725
 2021-05-08 14:40:01 +00:00
Alex Buynytskyy
e76e1ef510 Avoid sysfs name clashes. 
Bug: 187437944
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest ApkVerityInstallTest
Change-Id: Idc8cb4d170b0bfd98ee3a10bdf57439801739757
 2021-05-08 14:10:33 +00:00
Soonil Nagarkar
c5464d5882 Merge "Fix NPE in LocationProviderManager" into sc-dev am: 93f7083eab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14468644

Change-Id: I7b8e790a19eabecce5e4795de49dc6da1ed7fafd
 2021-05-08 12:49:01 +00:00
Soonil Nagarkar
93f7083eab Merge "Fix NPE in LocationProviderManager" into sc-dev 2021-05-08 12:26:25 +00:00
Edgar Wang
ccc34ecab1 Merge "Update MainSwitchBar to Material Next style." into sc-dev am: 7948cf883c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13816345

Change-Id: I65809bc357dfade466bd4f6704d799510d44e6f3
 2021-05-08 07:40:26 +00:00
Edgar Wang
6c6da1e547 Merge "Considering to mainline moudle to move some resource to v31" into sc-dev am: 673add4d48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161089

Change-Id: Ib244c485d14d44ecc2833f9bbf19a8a5d3336712
 2021-05-08 07:40:11 +00:00
TreeHugger Robot
17d78b32b5 Merge "Only update default home when the preferred home activity is modified." into sc-dev am: bfdcaaf25d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14314665

Change-Id: I7e45d1d0ea6291d48013a23ebd5b8c5b3004fcc9
 2021-05-08 07:39:54 +00:00
Edgar Wang
7948cf883c Merge "Update MainSwitchBar to Material Next style." into sc-dev 2021-05-08 07:30:06 +00:00
Edgar Wang
673add4d48 Merge "Considering to mainline moudle to move some resource to v31" into sc-dev 2021-05-08 07:29:37 +00:00
TreeHugger Robot
bfdcaaf25d Merge "Only update default home when the preferred home activity is modified." into sc-dev 2021-05-08 07:19:25 +00:00
Shashwat Razdan
99fa5aafb0 Merge "Resurrecting sessions when AiAi is bound for the first time" into sc-dev am: 0408e507b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443649

Change-Id: I26045acc1e413fd296d891b671648b1206dede0f
 2021-05-08 00:09:28 +00:00
Shashwat Razdan
0408e507b6 Merge "Resurrecting sessions when AiAi is bound for the first time" into sc-dev 2021-05-08 00:06:42 +00:00
TreeHugger Robot
36685e2606 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d0ca1ef6d4 -s ours am: 46f671f7a3 -s ours am: a32a8bb74f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I184b01621f0eece9049a647f64f920398caf308f
 2021-05-08 00:01:44 +00:00
TreeHugger Robot
005a249080 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9145d1b503 -s ours am: e5c7f2c24d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7d739ee1b9812a26997d60ee1e4ecc190f0207f
 2021-05-08 00:01:12 +00:00
TreeHugger Robot
a32a8bb74f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d0ca1ef6d4 -s ours am: 46f671f7a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a5b646b24ef57d5ca0436ce09f59eb7b8a5d145
 2021-05-07 23:46:00 +00:00
TreeHugger Robot
e5c7f2c24d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9145d1b503 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80ee91089980968f1e7f97d15d403c9d582460ad
 2021-05-07 23:44:48 +00:00
TreeHugger Robot
9145d1b503 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-07 23:29:19 +00:00
TreeHugger Robot
46f671f7a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d0ca1ef6d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80cdc3d4b5e901532b0f59409c0180a4c0d4f77e
 2021-05-07 23:26:44 +00:00
TreeHugger Robot
d0ca1ef6d4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-07 23:11:06 +00:00
Baligh Uddin
f8b02ebccf [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours am: 0316c8a07d -s ours am: 7e3b81d5cd -s ours am: 77adbea4e4 -s ours 
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history

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

Change-Id: Ifdaa24e001f7ba8b91fac4fc19c24b28d01b2127
 2021-05-07 23:05:06 +00:00
Baligh Uddin
cc4fc2187a [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-qpr-dev am: fd2df8ef61 -s ours am: 1d2d9b118e -s ours am: 73b9e9710c -s ours 
am skip reason: Merged-In I31f2b4512164bb043d78d503f4f38accedc49f8d with SHA-1 7ec2a29f78 is already in history

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

Change-Id: I6ca4a600abb3dccefa015eec900de409d9d5b01b
 2021-05-07 23:04:28 +00:00
Baligh Uddin
68122f3aa2 [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours am: 5a5cba8407 -s ours am: c8bc3d8f74 -s ours 
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history

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

Change-Id: Id7e6a616cc0087ef8aeb001c1184b613d4d9d159
 2021-05-07 23:04:00 +00:00
Baligh Uddin
77adbea4e4 [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours am: 0316c8a07d -s ours am: 7e3b81d5cd -s ours 
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history

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

Change-Id: I0ae83c99e76ab21728fc4b3941672b15e655d681
 2021-05-07 22:46:25 +00:00
Baligh Uddin
73b9e9710c [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-qpr-dev am: fd2df8ef61 -s ours am: 1d2d9b118e -s ours 
am skip reason: Merged-In I31f2b4512164bb043d78d503f4f38accedc49f8d with SHA-1 7ec2a29f78 is already in history

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

Change-Id: Ibf9f78fec9e1dba484b7d70268ea94bf304e0ea9
 2021-05-07 22:45:38 +00:00
Baligh Uddin
c8bc3d8f74 [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours am: 5a5cba8407 -s ours 
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history

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

Change-Id: Ic8340f86d9a533e11112ade1e50d4f7c76f52791
 2021-05-07 22:43:54 +00:00
Fabian Kozynski
2811136ae1 Merge "Add rounded corners to customizer decoration" into sc-dev am: 6765c1d932 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14464249

Change-Id: I41cfef8d23b8422e49013e4f70eabdd4641f561b
 2021-05-07 22:36:56 +00:00
Fabian Kozynski
6765c1d932 Merge "Add rounded corners to customizer decoration" into sc-dev 2021-05-07 22:34:02 +00:00
Bill Yi
98a58140e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 84dccc72e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0aaec0b966b39ed78e75757f1a4b005b9e1bf4d
 2021-05-07 22:29:15 +00:00
Rob Carr
ed42694844 Merge "SyncRtSurfaceTransactionApplier: Improve thread safety" into sc-dev am: 84c2f5bf21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14445476

Change-Id: I4ba27edd9d75cb5beea67cc7591cdb9f4368a277
 2021-05-07 22:28:33 +00:00
Baligh Uddin
5a5cba8407 [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours 
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history

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

Change-Id: Idd9781d76bff77e9e47a15019f2e229047d9ebf4
 2021-05-07 22:28:20 +00:00
Baligh Uddin
7e3b81d5cd [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours am: 0316c8a07d -s ours 
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history

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

Change-Id: I4746105a532cea01de6e83a4994c00c104337c83
 2021-05-07 22:28:01 +00:00
Baligh Uddin
1d2d9b118e [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-qpr-dev am: fd2df8ef61 -s ours 
am skip reason: Merged-In I31f2b4512164bb043d78d503f4f38accedc49f8d with SHA-1 7ec2a29f78 is already in history

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

Change-Id: I24eed3e77e1b6d59f43b6779588b0c397a3f42bc
 2021-05-07 22:26:47 +00:00
Baligh Uddin
0316c8a07d [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours 
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history

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

Change-Id: I98439d6452985e35a8c48b1f34e094b7be20d9bb
 2021-05-07 22:26:40 +00:00
Baligh Uddin
c560d404a0 Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev 2021-05-07 22:16:55 +00:00
Baligh Uddin
fd2df8ef61 Merge "Migrate apex/permission to packages/modules/Permission" into rvc-qpr-dev 2021-05-07 22:14:50 +00:00
Bill Yi
84dccc72e0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-07 22:11:41 +00:00
Rob Carr
84c2f5bf21 Merge "SyncRtSurfaceTransactionApplier: Improve thread safety" into sc-dev 2021-05-07 22:11:00 +00:00
TreeHugger Robot
d474427436 Merge "Change default temp allowlist duration for BOOT_COMPLETED broadcast to 20 seconds." into sc-dev am: 969f4ec61b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443545

Change-Id: I022749af37aa832f492d3a71b5ced1dc9e7eec30
 2021-05-07 21:51:17 +00:00
Tim Barron
4a435d672b Merge "Call persistToDisk after indexing VisibilityDoc" into sc-dev am: 6e797a5de7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344095

Change-Id: I08e892734b9738fa99b7499dc0cceeecb59bae0a
 2021-05-07 21:50:42 +00:00