Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
750,046 Commits 3 Branches 0 Tags
bc86efa34476e042c905ba2f0773fb696e6965f0
Commit Graph

750046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
bc86efa344 Merge "Address the Smartspace UI templates APIs review comments." 2022-02-24 18:25:47 +00:00
TreeHugger Robot
f2ee166bd5 Merge "Remove the current input focused window when ANR" into tm-dev am: d0dfaa7c45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16970763

Change-Id: I1f94ed418e161d1258e0e45d082b98c8d7e345d1
 2022-02-24 18:06:02 +00:00
TreeHugger Robot
c5bb03d224 Merge "Fix bug in checking getLastLocation identities" into tm-dev am: 05b801bd46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16997763

Change-Id: I71028a6fd7a05930ffc004e9afa5290b96c65c0c
 2022-02-24 18:04:56 +00:00
Matt Pietal
c7b6b3459d Merge "User switcher - Create user dialog fixes" into tm-dev am: 9667c0817d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985647

Change-Id: I15e04c9b230045acd31baa3ce323f11fd34d58ff
 2022-02-24 18:04:08 +00:00
Nate Myren
2d47d40204 Merge "Automatically show Safety Tile" into tm-dev am: 2606f9c4ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981753

Change-Id: If33174ee1441a4fab8df9596b0fd2922ec1f297f
 2022-02-24 18:03:02 +00:00
Kholoud Mohamed
a4ea6126aa Merge "Change Callable to Supplier in the dpm resource apis" into tm-dev am: 7e76fddc52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988746

Change-Id: Ic86d47f27e7ada265f49b4a189b70eda57786a3b
 2022-02-24 18:01:17 +00:00
TreeHugger Robot
35da705727 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-02-24 18:00:38 +00:00
TreeHugger Robot
c154ede8b6 [automerger skipped] Merge "Adding a timeout for active-unlock" into tm-dev am: 4207fcf360 -s ours 
am skip reason: Merged-In Ia0ccf7ecc9dacf9f4a7a913c7fce8532e6a1ece1 with SHA-1 2410cfc05e is already in history

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

Change-Id: Ica362cc5fbb57656f35e3f9c000298bf8de4bef5
 2022-02-24 17:57:57 +00:00
Your Name
274349de2b [automerger skipped] Adding a timeout for active-unlock am: 57e6944277 -s ours 
am skip reason: Merged-In Ia0ccf7ecc9dacf9f4a7a913c7fce8532e6a1ece1 with SHA-1 2410cfc05e is already in history

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

Change-Id: Ibadde6ffd066695b5a0f340d229d6cee2209f863
 2022-02-24 17:57:30 +00:00
TreeHugger Robot
2c8001d297 Merge "Add traces to aid onScreenTurnedOn latency debugging" into tm-dev am: b63a699489 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002644

Change-Id: I7f23f158a59346b8144cd1fcec7cc33faf9dc785
 2022-02-24 17:55:47 +00:00
TreeHugger Robot
0a5994f556 Merge "DM: use the right terminology for divisor" into tm-dev am: 7baf6d7ce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16989012

Change-Id: I828e6b84ccc6e69ddce1ba141251b3f7acdef243
 2022-02-24 17:54:16 +00:00
TreeHugger Robot
d0dfaa7c45 Merge "Remove the current input focused window when ANR" into tm-dev 2022-02-24 17:53:46 +00:00
TreeHugger Robot
74effad779 Merge changes from topic "cherrypick-fix-anr-input-6mcjse09o2" 
* changes:
  [automerge] Remove the current input focused window when ANR 2p: 964305e1b2 2p: fcba280f4e
  [automerge] Remove the current input focused window when ANR 2p: 964305e1b2
  Remove the current input focused window when ANR
 2022-02-24 17:53:46 +00:00
TreeHugger Robot
b7aa8319d9 Merge "Replace LinkedList by a more performant collection" 2022-02-24 17:52:53 +00:00
Kholoud Mohamed
8a7e28ff85 Merge "rename callingPackageResourceId to resourceIdInCallingPackage" into tm-dev am: 8084c8c036 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16976028

Change-Id: I4e0fabea04a9870408c5de3cb5df3065e04604a3
 2022-02-24 17:51:52 +00:00
Jiakai Zhang
534f752da1 Merge "Add a runtime check to ensure that system server jars are prefetched." into tm-dev am: 4f04a08fef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16970524

Change-Id: I1b2b83f32d6c3cbee3de6818515b1fd03e652a55
 2022-02-24 17:50:21 +00:00
Christian Göllner
c6d10fdfa8 Merge "Revert "Motion: tweak split shade expansion on lockscreen with media."" into tm-dev am: 03879bfc1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003105

Change-Id: Id5e09158a69d412659362bb5b37380c5a2fd2c2b
 2022-02-24 17:49:40 +00:00
Caitlin Cassidy
a43c32defe [automerger skipped] Merge "[Ongoing Call] Catch a security exception instead of crashing SysUI." into tm-dev am: e586173d8d -s ours 
am skip reason: Merged-In I1108fc6fe01f284364331dd9de57ebe9390d4d78 with SHA-1 f91346f289 is already in history

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

Change-Id: If62aff36eb37fa1feaecb05a7d2d46f2569c2d3d
 2022-02-24 17:48:51 +00:00
Caitlin Cassidy
ac371de72f [automerger skipped] [Ongoing Call] Catch a security exception instead of crashing SysUI. am: 706633bcf8 -s ours 
am skip reason: Merged-In I1108fc6fe01f284364331dd9de57ebe9390d4d78 with SHA-1 f91346f289 is already in history

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

Change-Id: I4e3534c7821fab42a53b0f92df5c9298c63b34f5
 2022-02-24 17:48:22 +00:00
Caitlin Cassidy
d9d9b3fca0 [automerger skipped] Merge "[Media TTT] Hide the chip if the user taps the screen." into tm-dev am: c71704890f -s ours 
am skip reason: Merged-In I3951d0bbb3a04d5b82a54339a548b4e293bbf527 with SHA-1 4e3e7af43e is already in history

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

Change-Id: I49bb36a44228d8d1ed853f2209e47ca9c25efb48
 2022-02-24 17:45:58 +00:00
Caitlin Cassidy
dcc189f150 [automerger skipped] [Media TTT] Hide the chip if the user taps the screen. am: 3aa5b9ed5a -s ours 
am skip reason: Merged-In I3951d0bbb3a04d5b82a54339a548b4e293bbf527 with SHA-1 4e3e7af43e is already in history

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

Change-Id: Ic777bbf7fa8073421dffd3a071aa53a0095e19ae
 2022-02-24 17:45:30 +00:00
TreeHugger Robot
f51cf52fd3 Merge "Move all non shell quickswitch tests to presubmit" into tm-dev am: fdbfa75157 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003103

Change-Id: Id74959e70f581063eec67e6e0b191153e8f9c265
 2022-02-24 17:44:09 +00:00
Pat Manning
852ffc196f Merge "Removing 'override' from nav bar mode APIs." into tm-dev am: 80c4b33ddf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988243

Change-Id: I163546feab9b45348cb283ddde9f177b168ddef8
 2022-02-24 17:42:38 +00:00
TreeHugger Robot
d51db56c72 Merge changes from topic "remote-iorap-reland" 
* changes:
  [Re-land] Remove scripts related to iorap
  [Re-land] Remove iorap framework codes
 2022-02-24 17:36:50 +00:00
TreeHugger Robot
05b801bd46 Merge "Fix bug in checking getLastLocation identities" into tm-dev 2022-02-24 17:32:17 +00:00
Matt Pietal
9667c0817d Merge "User switcher - Create user dialog fixes" into tm-dev 2022-02-24 17:32:01 +00:00
Nate Myren
2606f9c4ed Merge "Automatically show Safety Tile" into tm-dev 2022-02-24 17:31:09 +00:00
TreeHugger Robot
cf1ee761c8 [automerger skipped] Merge "Replace LinkedList by a more performant collection" into tm-dev am: a8dcbbb97b am: f42821832c -s ours 
am skip reason: Merged-In I15328005007ddc58f56604f6064c30fbed2c01a6 with SHA-1 236e833e04 is already in history

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

Change-Id: I8a358c991b698c05ded5fc7961b25e94b99e25ed
 2022-02-24 17:29:47 +00:00
Kholoud Mohamed
7e76fddc52 Merge "Change Callable to Supplier in the dpm resource apis" into tm-dev 2022-02-24 17:28:18 +00:00
Kholoud Mohamed
475b864e17 Merge "Change DEVICE_POLICY_RESOURCE_UPDATED broadcast extras" into tm-dev am: c099351d94 am: 634e15e0a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16976026

Change-Id: I34faed7dbeeb42864a30282da3ad73b4cc8c645a
 2022-02-24 17:18:51 +00:00
TreeHugger Robot
4207fcf360 Merge "Adding a timeout for active-unlock" into tm-dev 2022-02-24 17:07:58 +00:00
TreeHugger Robot
b63a699489 Merge "Add traces to aid onScreenTurnedOn latency debugging" into tm-dev 2022-02-24 17:05:05 +00:00
TreeHugger Robot
7baf6d7ce8 Merge "DM: use the right terminology for divisor" into tm-dev 2022-02-24 16:51:35 +00:00
TreeHugger Robot
8edab3cc26 Merge "Replace LinkedList by a more performant collection" 2022-02-24 16:23:43 +00:00
Kholoud Mohamed
8084c8c036 Merge "rename callingPackageResourceId to resourceIdInCallingPackage" into tm-dev 2022-02-24 16:18:09 +00:00
Jiakai Zhang
4f04a08fef Merge "Add a runtime check to ensure that system server jars are prefetched." into tm-dev 2022-02-24 16:10:43 +00:00
Jiakai Zhang
1ab404993d Merge changes from topic "presubmit-am-5e074e05e4c74163b4f9a025baec3cd0" 
* changes:
  [automerge] Add a runtime check to ensure that system server jars are prefetched. 2p: 418ab8212c 2p: 1cab79eff5
  [automerge] Add a runtime check to ensure that system server jars are prefetched. 2p: 418ab8212c
  Add a runtime check to ensure that system server jars are prefetched.
 2022-02-24 16:10:43 +00:00
Christian Göllner
03879bfc1f Merge "Revert "Motion: tweak split shade expansion on lockscreen with media."" into tm-dev 2022-02-24 16:04:44 +00:00
Pedro Loureiro
c1931a482e [automerger skipped] Merge "Disable updatable system manifest for T" into tm-dev am: 4b9437eb95 -s ours am: b888f9b1ab -s ours 
am skip reason: Merged-In I6b890e5536c17dd53722e2c3a781c85dd9d6bdf0 with SHA-1 87d1af1d80 is already in history

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

Change-Id: I61802c921f685a9b6114ad445083b680a4f70554
 2022-02-24 15:58:30 +00:00
Pedro Loureiro
070a299a54 [automerger skipped] Disable updatable system manifest for T am: 591cfa680c -s ours am: 8ef7c741d8 -s ours 
am skip reason: Merged-In I6b890e5536c17dd53722e2c3a781c85dd9d6bdf0 with SHA-1 87d1af1d80 is already in history

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

Change-Id: I136eeaac0a69b24769fc2753d827e15c81923467
 2022-02-24 15:58:09 +00:00
Christian Göllner
84cbea5323 Revert "Motion: tweak split shade expansion on lockscreen with media." 
This reverts commit 36e1d8ebde.

Reason for revert: Causes crashes expanding shade on lock screen without media.

Change-Id: I998d4f6c214d49607f8081e2f51e876feed0943c
Fixes: 221193561
Fixes: 221176472
 2022-02-24 15:57:38 +00:00
TreeHugger Robot
93586a38b6 Merge changes from topic "SF_Solution" into tm-dev am: 2a01b66100 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996786

Change-Id: Ide13250e7aa488aa9fce8995253ccfc6d3ce6e35
 2022-02-24 15:54:58 +00:00
Pablo Gamito
4ef263882b Merge "Make use of TAPL in quickswitch tests" into tm-dev am: 554859be00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988726

Change-Id: I7f77cc40f4765a06b456fcd8d58acf5066187f47
 2022-02-24 15:54:12 +00:00
Louis Chang
6bc73b0161 Merge "Removing RWC#getValidLaunchRootTaskInTaskDisplayArea" into tm-dev am: 8c735f9b5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938648

Change-Id: I211b95f225e4cac6c1bc2b25132e6a3fe63487d1
 2022-02-24 15:53:15 +00:00
TreeHugger Robot
c7c25219a8 Merge "Fix wait condition for SetRequestedOrientationWhilePinnedTest" into tm-dev am: 68e3f55c66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16999564

Change-Id: I89a8c8f0c126557998fef795a21aede4b76a7372
 2022-02-24 15:51:59 +00:00
TreeHugger Robot
c8dd12d16f Merge "Fix wait condition on quickswitch" into tm-dev am: 2abbbed2ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002643

Change-Id: Ic3d3fa04fbece93f4b101e6eca5168b1496bddb3
 2022-02-24 15:50:55 +00:00
Bill Yi
cd0c730591 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 43244abf79 -s ours am: f8c718db44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifbb17a42634be32e000caf96f2466aa5af937e1e
 2022-02-24 15:50:06 +00:00
Caitlin Cassidy
e586173d8d Merge "[Ongoing Call] Catch a security exception instead of crashing SysUI." into tm-dev 2022-02-24 15:49:59 +00:00
TreeHugger Robot
c4d2d4a14e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 011a7c7c14 -s ours am: 27813cc614 -s ours am: b3475ef348 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b71dd918a9b30190af5757b6346095de6e47398
 2022-02-24 15:49:20 +00:00
Caitlin Cassidy
c71704890f Merge "[Media TTT] Hide the chip if the user taps the screen." into tm-dev 2022-02-24 15:49:19 +00:00