Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
823,198 Commits 3 Branches 0 Tags
f4b7cd0d17c00a0a9b6010eb8d5f00c4e989beb8
Commit Graph

823198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f4b7cd0d17 Merge "Indenting DPC as per the linting rules" 2022-08-09 18:32:27 +00:00
Mateusz Cicheński
792fd0c911 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev am: 6bd105d566 am: d06d3cd4a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539084

Change-Id: I321a77e55ca7921347c551baa469e317c08447dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:24:00 +00:00
Treehugger Robot
581b694652 Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d am: 8b97661f1f am: 40987da89f am: 2d31031864 am: 76982c18ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: If6eacbec487ce6ca63d0d685f3b28cd7ec4e2926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:23:28 +00:00
An An Yu
0560f94bd6 Merge "Update WM Jetpack extensions prebuilt (From updated aosp branch, ran window:extensions:extensions:build)" into tm-qpr-dev am: 1ad95b58f3 am: 8bd97c09ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537448

Change-Id: Iba467118045705eccf3b39e88b6cf7ab5bdd4963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:21:55 +00:00
Automerger Merge Worker
232a4b774d Merge "Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: f8f3841ceb" into tm-qpr-dev-plus-aosp am: f780fb6798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I6980e6ed1e31e75901b72f010ce2007697fb976d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:19:26 +00:00
Long Ling
b0837dffc6 Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: 8ecb11e398 am: 561e784fe6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I70867c17c6ef185ad936d100c6da2670dd88155a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:17:29 +00:00
Mateusz Cicheński
d06d3cd4a9 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev am: 6bd105d566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539084

Change-Id: I4ff99b5c2f12070cd659b96076df46a92a6cdfac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:14:23 +00:00
Huihong Luo
b39957d4ee Merge "Remove getPrimaryPhysicalDisplayId" 2022-08-09 18:08:37 +00:00
Treehugger Robot
76982c18ce Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d am: 8b97661f1f am: 40987da89f am: 2d31031864 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: Icf423e47a981aac91d0df79b7de168f1189f794f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:05:17 +00:00
Mateusz Cicheński
6bd105d566 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev 2022-08-09 17:53:55 +00:00
Treehugger Robot
2d31031864 Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d am: 8b97661f1f am: 40987da89f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: I3dee96de9e4ca626ba5591bc59c47b0daf3886dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:49:05 +00:00
An An Yu
8bd97c09ac Merge "Update WM Jetpack extensions prebuilt (From updated aosp branch, ran window:extensions:extensions:build)" into tm-qpr-dev am: 1ad95b58f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537448

Change-Id: Ie078c74d2797ab30b9481c0672d3a0343e567310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:48:20 +00:00
Automerger Merge Worker
f780fb6798 Merge "Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: f8f3841ceb" into tm-qpr-dev-plus-aosp 2022-08-09 17:48:11 +00:00
Long Ling
561e784fe6 Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: 8ecb11e398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I2f8c0909ca4fb6f6622776ccbbd67ae921a99324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:47:43 +00:00
Long Ling
cf197f8441 Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: f8f3841ceb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I37a73b8eba905b7670177a80167b508cdb073695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:47:36 +00:00
An An Yu
1ad95b58f3 Merge "Update WM Jetpack extensions prebuilt (From updated aosp branch, ran window:extensions:extensions:build)" into tm-qpr-dev 2022-08-09 17:26:09 +00:00
An An Yu
eb374a23aa Update WM Jetpack extensions prebuilt 
(From updated aosp branch, ran window:extensions:extensions:build)

Test: Manual on sample apps (SplitList, SplitMain, SplitTrampoline)
Bug: 241570741
Change-Id: I2229a019c48f012d1fd1ffcfeed74444d2f43212
 2022-08-09 10:25:18 -07:00
Treehugger Robot
40987da89f Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d am: 8b97661f1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: Ifa32610e88d27c5c64fe32560846a032f4890e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:23:14 +00:00
Long Ling
f8f3841ceb Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: Idbc0f99d47dae9eb10ae88006cd3c4799ce853d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:22:59 +00:00
Long Ling
8ecb11e398 Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I982aaf3e044360d8b8d454ffe46293934b44e53e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:22:57 +00:00
Long Ling
135d11828b Merge "Dump HWComposer when watchdog bites" into tm-d1-dev 2022-08-09 16:51:32 +00:00
Treehugger Robot
8b97661f1f Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: Ib51176a722ab7661ca50ca72502b8091ecf58bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:50:40 +00:00
Beth Thibodeau
8ce2b6ed0d Merge "Fix reactivated media card when recommendation is invalid" into tm-qpr-dev am: 6ee27b1ebd am: 340ba46c86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19562139

Change-Id: I5d41ed36709246be8594210971fb7fad462f17f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:27:44 +00:00
TreeHugger Robot
befc4afad0 Merge "Add logs to handleClick methods in QSTileImpl" into tm-qpr-dev am: eddeda4f93 am: a328ccc078 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19526990

Change-Id: I2c9c368468072233f2011acaf55c45fe145ed55c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:27:02 +00:00
Beth Thibodeau
340ba46c86 Merge "Fix reactivated media card when recommendation is invalid" into tm-qpr-dev am: 6ee27b1ebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19562139

Change-Id: Ie3a11e49b916958c9e85201019194829a8c1b378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:26:25 +00:00
Jordan Demeulenaere
62a717bad0 [automerger skipped] Merge "Move the compose code to tm-qpr-dev (1/2)" into tm-qpr-dev am: b8ea807587 am: 8532baab48 -s ours 
am skip reason: Merged-In Ic3efb42d371c6aac8c2a6297a0cb192a780903cd with SHA-1 33470b902e is already in history

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

Change-Id: I420a42052c949e8bb77e38d45f930482355ecdde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:25:58 +00:00
TreeHugger Robot
a328ccc078 Merge "Add logs to handleClick methods in QSTileImpl" into tm-qpr-dev am: eddeda4f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19526990

Change-Id: Id41b890965aede95fab5fdb2ef0e182ac0891e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:25:47 +00:00
Jordan Demeulenaere
8532baab48 Merge "Move the compose code to tm-qpr-dev (1/2)" into tm-qpr-dev am: b8ea807587 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19494150

Change-Id: Ia9ead9a0c07c13a6f8f07ed91f1cd87214e1053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:25:04 +00:00
Michael Mikhail
4cdf6319fc Merge "Fix focus at ttt chip" into tm-qpr-dev am: cd4712486d am: 1fcdd5423c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19531389

Change-Id: If7028d75858a3a86dc16c407e9626af21f0d1031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 16:24:57 +00:00
Beth Thibodeau
6ee27b1ebd Merge "Fix reactivated media card when recommendation is invalid" into tm-qpr-dev 2022-08-09 16:22:53 +00:00
Jack Yu
50d7d1fa0c Merge "Removed IWLAN legacy mode support" 2022-08-09 16:11:40 +00:00
Treehugger Robot
7547a2454d Merge "Limit the accepted length of SIM PIN to 8 digits" 2022-08-09 16:00:02 +00:00
TreeHugger Robot
eddeda4f93 Merge "Add logs to handleClick methods in QSTileImpl" into tm-qpr-dev 2022-08-09 15:59:46 +00:00
Rupesh Bansal
577b97f731 Indenting DPC as per the linting rules 
Cleaning up the indentation of DPC. This is needed because we soon plan
to create a clone of this class, where the linting checks are applied,
which are not on an already existing class

Bug: 241920473
Test: Manual
Change-Id: Ia1d3db02d5ad0c774ef48a26c6cca8fdba851c15
 2022-08-09 15:47:23 +00:00
Jordan Demeulenaere
b8ea807587 Merge "Move the compose code to tm-qpr-dev (1/2)" into tm-qpr-dev 2022-08-09 15:46:53 +00:00
Michael Mikhail
1fcdd5423c Merge "Fix focus at ttt chip" into tm-qpr-dev am: cd4712486d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19531389

Change-Id: I3c57754d1900029217872ad08e178511cf7cd995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 15:39:10 +00:00
Beth Thibodeau
7173943e63 Fix reactivated media card when recommendation is invalid 
Recently active media should show whenever we get an active
recommendation card, even if it is invalid. This was not happening and the
media card would only be visible if the recommendation card was valid.

This adds a condition to hasActiveMediaOrRecommendation that checks
whether a card was reactivated, so that MediaHosts calling it get the
correct visibility.

Fixes: 241150583
Test: manual (steps in bug)
Test: atest MediaDataFilterTest
Change-Id: I5347367bc86a9ca499a47b3ef310e9e5774d79c5
 2022-08-09 15:25:15 +00:00
Michael Mikhail
cd4712486d Merge "Fix focus at ttt chip" into tm-qpr-dev 2022-08-09 15:11:12 +00:00
Felipe Leme
ee9e9fe760 Merge "Updated UserManager.isUserVisible() to check for profiles." 2022-08-09 14:25:45 +00:00
Felipe Leme
4204b2f55d Merge "Initial implementation of UserManager.isUserVisible()." 2022-08-09 14:25:26 +00:00
John Reck
ce2a426ace Merge "Allow PixelCopy for a window from any View" 2022-08-09 13:32:18 +00:00
Anna Bauza
b82bd9b22d Merge "Add user 0 when more than one UserInfo atom is reported." 2022-08-09 13:23:52 +00:00
Sarup Dalwani
7da331c78e Merge "Making add and clear CPIF apis as TestApis" 2022-08-09 12:51:41 +00:00
Sarup Dalwani
2772baedf5 Merge "Adding Access Control in CrossProfileIntentFilter" 2022-08-09 12:51:41 +00:00
Chilun Huang
bc42fa7c43 Merge "Prevent new instance if drop on split-screen with the same app" into tm-qpr-dev am: 3d3bf180c4 am: 903c1e08cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19533592

Change-Id: I4745ae3367a0b1ba1de1a879012d39727801d5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 12:41:37 +00:00
Chilun Huang
903c1e08cb Merge "Prevent new instance if drop on split-screen with the same app" into tm-qpr-dev am: 3d3bf180c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19533592

Change-Id: Ic81dc75bb5cecb44fb4964e77ccec3230fb7232d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 12:24:28 +00:00
Chilun Huang
3d3bf180c4 Merge "Prevent new instance if drop on split-screen with the same app" into tm-qpr-dev 2022-08-09 12:06:03 +00:00
Shaowei Shen
715c51f98e Merge "[Output Swithcer] Fix volume control issue for Group" into tm-d1-dev am: 4fffb051d5 am: 122f364ccc am: 989c35d956 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19535141

Change-Id: I14964e8b43f77f4e221ec9f4184873312eb3ac50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 10:03:16 +00:00
Shaowei Shen
a80e92e0fc Merge "[Output Swithcer] Fix volume control issue for Group" into tm-d1-dev am: 4fffb051d5 am: 83f3bbb832 am: 0f63b6446b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19535141

Change-Id: Ie1165f42ea6a15d9f62fbb3965d1a2edfe288064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 10:02:25 +00:00
Shaowei Shen
989c35d956 Merge "[Output Swithcer] Fix volume control issue for Group" into tm-d1-dev am: 4fffb051d5 am: 122f364ccc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19535141

Change-Id: Ic144945f3fb3d9cea3df20574ccedcfd9ab92f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 09:44:23 +00:00