Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wonsik Kim
9d030d5a3f Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: fddc33a377 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I1230455837d18f7a29b048b83f8f2f2a7bd60afb
 2020-06-20 01:00:56 +00:00
Treehugger Robot
52a31dd406 Merge "Move car companion device support app perms to framework" 2020-06-20 00:51:35 +00:00
Wonsik Kim
3c31448da7 Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I36e8e9dbdf38d88c43df76180d597561655a0d71
 2020-06-20 00:49:51 +00:00
Wonsik Kim
fddc33a377 Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I76abd4518054a2fa8783c063709c4f7aef79a0f2
 2020-06-20 00:49:48 +00:00
TreeHugger Robot
212c5d2680 Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 04fb24d142 am: 76f777eb3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: If0ac495d20152ccbe5f7b98d0bd9ce9dcc5616da
 2020-06-20 00:40:34 +00:00
Automerger Merge Worker
39da9295e8 Merge "Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: 2624f61fe3" into rvc-d1-dev-plus-aosp am: 71f1b34e37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934273

Change-Id: Ida263896275ee7b9f2c64e540c982581a266ba56
 2020-06-20 00:40:23 +00:00
Automerger Merge Worker
640028962a Merge "Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 6affc2707b" into rvc-d1-dev-plus-aosp am: d26aca69c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: I5040bc26650b741671ccc77c471b9f44e42b2987
 2020-06-20 00:39:55 +00:00
Wonsik Kim
7e1b558949 Merge "media: fix race condition on async release" into rvc-dev 2020-06-20 00:39:43 +00:00
Automerger Merge Worker
0fe6691157 Merge "Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: 954c599c45" into rvc-d1-dev-plus-aosp am: fed445a5a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936921

Change-Id: Iaa12bc7185cffaa1ea3fbd00693c585af9ef9bd7
 2020-06-20 00:39:25 +00:00
Automerger Merge Worker
e8c07bdeaa Merge "Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: d0370df46f" into rvc-d1-dev-plus-aosp am: 2c710b147a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934273

Change-Id: I573bc0c9cc4ec83cce707006b859db2868dd810b
 2020-06-20 00:38:53 +00:00
Automerger Merge Worker
c5417bfb26 Merge "Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e am: f782357b16" into rvc-d1-dev-plus-aosp am: 8a2dfe1630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: Ib211b7f4461c347a2c7beb7d0c984bae47ec40f7
 2020-06-20 00:38:10 +00:00
TreeHugger Robot
4e688954f6 Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 6affc2707b am: 14b026be14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: I7853d826972dd9b2aeaceca62bbaba13e7524125
 2020-06-20 00:37:58 +00:00
Automerger Merge Worker
e51cae0a3d Merge "Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: d0370df46f am: d8b558680d" into rvc-qpr-dev-plus-aosp 2020-06-20 00:37:56 +00:00
Automerger Merge Worker
13f48fbb7c Merge "Merge "Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: c7ae85f4d8" into rvc-d1-dev-plus-aosp am: 854bf943da" into rvc-qpr-dev-plus-aosp 2020-06-20 00:37:51 +00:00
TreeHugger Robot
fe3fcb0703 Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: d0370df46f am: d8b558680d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934273

Change-Id: Ib2af309557d2e951f322299c32396e80aa75ab18
 2020-06-20 00:37:49 +00:00
Automerger Merge Worker
14b245d319 Merge "Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: c7ae85f4d8" into rvc-d1-dev-plus-aosp am: 854bf943da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936921

Change-Id: I94b2cb2f75f3760e466e951044915b74832fc112
 2020-06-20 00:37:45 +00:00
Nate Jiang
cc69dcfd1a Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: c7ae85f4d8 am: ede7a00796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936921

Change-Id: I61ea89e351d092dedd8fb0f7c0485f0c444914fe
 2020-06-20 00:37:34 +00:00
TreeHugger Robot
2eedd1565e Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e am: b0682c456f am: b31b76f4b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: I73cbf4ef9d3128f6980bdad7d78caddcb4a7bd1a
 2020-06-20 00:37:14 +00:00
Automerger Merge Worker
52b567d149 Merge "Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 58c69f01c5" into rvc-d1-dev-plus-aosp am: d0c8434771 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923800

Change-Id: Icd60467f93b3eae4a692cc446afd9d0b6512414a
 2020-06-20 00:36:53 +00:00
Automerger Merge Worker
f9c4d2dff7 Merge "Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 2e075cfb8a am: ec6787c1e3" into rvc-qpr-dev-plus-aosp 2020-06-20 00:36:41 +00:00
TreeHugger Robot
fcf885f21a Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e am: b0682c456f am: e5062ff26c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: Ifc69d4b19bf18f28c4e42c246d9ed9fdd58ee4ea
 2020-06-20 00:36:33 +00:00
TreeHugger Robot
e3018da091 Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 2e075cfb8a am: ec6787c1e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923800

Change-Id: I4c64507ffa76f3d0dd1c23ec8e0bf1628aa5d88d
 2020-06-20 00:36:27 +00:00
TreeHugger Robot
1e30c47ca6 Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 2e075cfb8a am: 21a1c50d03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923800

Change-Id: Ie1c2376a1f800ade61238310078cdab379974d35
 2020-06-20 00:36:19 +00:00
TreeHugger Robot
76f777eb3d Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 04fb24d142 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: I62d95dc565a031d9a0f9f1e8aa6a15be004e7136
 2020-06-20 00:24:23 +00:00
Automerger Merge Worker
71f1b34e37 Merge "Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: 2624f61fe3" into rvc-d1-dev-plus-aosp 2020-06-20 00:24:20 +00:00
Automerger Merge Worker
d26aca69c0 Merge "Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 6affc2707b" into rvc-d1-dev-plus-aosp 2020-06-20 00:24:15 +00:00
TreeHugger Robot
ebd5b9b56e Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: 2624f61fe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934273

Change-Id: I0bcfcb7c1d88c8eee1584f3ccfec1b5b721f8911
 2020-06-20 00:24:09 +00:00
TreeHugger Robot
14b026be14 Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 6affc2707b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: Id6f2d7d019f9db43101eea6a94b79b8e35ef2825
 2020-06-20 00:24:06 +00:00
TreeHugger Robot
9a56fc9d77 Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 6affc2707b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: I467cdc91b8747234fc21241b2a2753bee4871488
 2020-06-20 00:24:05 +00:00
Automerger Merge Worker
fed445a5a7 Merge "Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: 954c599c45" into rvc-d1-dev-plus-aosp 2020-06-20 00:24:04 +00:00
Nate Jiang
163a2bff0a Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: 954c599c45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936921

Change-Id: Id231422d6a91175fa19c699f2a4de2a31c28e483
 2020-06-20 00:23:59 +00:00
Automerger Merge Worker
2c710b147a Merge "Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: d0370df46f" into rvc-d1-dev-plus-aosp 2020-06-20 00:23:52 +00:00
Automerger Merge Worker
8a2dfe1630 Merge "Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e am: f782357b16" into rvc-d1-dev-plus-aosp 2020-06-20 00:23:49 +00:00
TreeHugger Robot
d8b558680d Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: d0370df46f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934273

Change-Id: Ied53b88283851d96d87a3fa2c17838580699a314
 2020-06-20 00:23:46 +00:00
TreeHugger Robot
a686056b46 Merge "Remove bubbles if their shortcuts are removed or if the app is uninstalled." into rvc-dev am: 803d1971a7 am: d0370df46f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934273

Change-Id: I03adbb5adbadea2e277f8df3c83550c1b3faac97
 2020-06-20 00:23:42 +00:00
Automerger Merge Worker
854bf943da Merge "Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: c7ae85f4d8" into rvc-d1-dev-plus-aosp 2020-06-20 00:23:39 +00:00
TreeHugger Robot
4a4b450c86 Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e am: f782357b16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: Ie453d518da233bb8372b93a8dd8240e4adb64aa3
 2020-06-20 00:23:39 +00:00
Nate Jiang
ede7a00796 Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: c7ae85f4d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936921

Change-Id: I16205afb9ef082850e04fa67f1a4f7d23a7933a3
 2020-06-20 00:23:32 +00:00
Nate Jiang
dd1d0544b1 Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227ce am: c7ae85f4d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936921

Change-Id: I11619c5816395a3710dff382be38b7ae94c9c30e
 2020-06-20 00:23:30 +00:00
Automerger Merge Worker
d0c8434771 Merge "Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 58c69f01c5" into rvc-d1-dev-plus-aosp 2020-06-20 00:23:29 +00:00
TreeHugger Robot
b31b76f4b2 Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e am: b0682c456f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: Iaf69225861e9f4846f1c717d93b7365344737396
 2020-06-20 00:23:15 +00:00
TreeHugger Robot
e5062ff26c Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e am: b0682c456f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: Ia7216727890098ac4099aef7dfc728114ccc171f
 2020-06-20 00:23:15 +00:00
TreeHugger Robot
08aa14126f Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 58c69f01c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923800

Change-Id: I5fbcdd655ea056d4fdeb9f099ac9177831086a9e
 2020-06-20 00:23:13 +00:00
TreeHugger Robot
21a1c50d03 Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 2e075cfb8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923800

Change-Id: I779fca3405479a13d86180290615d4938d8cd689
 2020-06-20 00:23:02 +00:00
TreeHugger Robot
ec6787c1e3 Merge "Don't show badge for media style notifications" into rvc-dev am: e0034ad1c5 am: 2e075cfb8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923800

Change-Id: I929bfa2e9c398e4474360d0867a44b6befba168a
 2020-06-20 00:23:01 +00:00
TreeHugger Robot
6affc2707b Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: I9e3ca572d985cd4486fd26eac54ff23670229cdb
 2020-06-20 00:12:58 +00:00
TreeHugger Robot
04fb24d142 Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511

Change-Id: I31c9b6250db94def939b3e7a13eeab6e7b527808
 2020-06-20 00:08:10 +00:00
Automerger Merge Worker
bfab876de1 Merge "Merge "Up contrast for empty overflow text" into rvc-dev am: b16cc11834 am: 43798166f5 am: 069c9ef45d" into rvc-qpr-dev-plus-aosp 2020-06-20 00:08:07 +00:00
TreeHugger Robot
48dc192499 Merge changes I4fdf368e,Ibc6be890 into rvc-dev 
* changes:
  SurfaceControlViewHost: Release ViewRoot from finalizer
  SurfaceControlViewHost: Call doDie with true
 2020-06-20 00:07:56 +00:00
TreeHugger Robot
01941c2651 Merge "Up contrast for empty overflow text" into rvc-dev am: b16cc11834 am: 43798166f5 am: 069c9ef45d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931374

Change-Id: I762716817e9e701f54bc7d450aec1fe1032de47b
 2020-06-20 00:07:56 +00:00