Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
647,182 Commits 3 Branches 0 Tags
aa70826ca7f4f3e7049c245e2ecacfc6c873d166
Commit Graph

647182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
aa70826ca7 [automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours am: acfbbafa98 -s ours am: 83a085e8cc -s ours am: 78ad33b608 -s ours am: 691b69364d -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: I39ca33bc59c432aba0c5bcc8b0519f4ec9d04349
 2021-06-28 17:24:44 +00:00
Christopher Tate
80c0cdab88 [automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 am: cb8e4e8db6 am: 8ebf5ba96a am: 1bd2f52715 -s ours am: 6be94c05fb -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 76e8e04703 is already in history

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

Change-Id: I2070445734311a36da70d270f8bf85b0f377f3c7
 2021-06-28 17:24:30 +00:00
Hui Yu
43555dc8ed [automerger skipped] Merge "Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: e51f884f6a" into rvc-qpr-dev am: bc54a29146 -s ours am: 7370510868 -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: I87770eb52b473feb72e70cc4b7e55ed4c7e5d5fb
 2021-06-28 17:24:18 +00:00
Josh Tsuji
d206664c95 Merge "Don't hide AOD icons if we're not in KEYGUARD but will be shortly due to the screen off animation." into sc-dev am: b5678c5ac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15098663

Change-Id: I368e613d5269afc727a8d17c3da93ebfd45061eb
 2021-06-28 17:23:56 +00:00
TreeHugger Robot
691b69364d [automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours am: acfbbafa98 -s ours am: 83a085e8cc -s ours am: 78ad33b608 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: I1309b2f68a875ce6cf2327b08ccd29f9a4a51ea2
 2021-06-28 17:07:43 +00:00
Christopher Tate
6be94c05fb [automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 am: cb8e4e8db6 am: 8ebf5ba96a am: 1bd2f52715 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 76e8e04703 is already in history

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

Change-Id: I39583e5016e080876c33d30ace2c40add534fecd
 2021-06-28 17:07:05 +00:00
Hui Yu
7370510868 [automerger skipped] Merge "Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: e51f884f6a" into rvc-qpr-dev am: bc54a29146 -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: Id95676561617b104646ec766de28c519d486d217
 2021-06-28 17:06:16 +00:00
Josh Tsuji
b5678c5ac0 Merge "Don't hide AOD icons if we're not in KEYGUARD but will be shortly due to the screen off animation." into sc-dev 2021-06-28 17:04:36 +00:00
TreeHugger Robot
78ad33b608 [automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours am: acfbbafa98 -s ours am: 83a085e8cc -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: I67badca23c5a2217c0aa9b09a684aacf90eb3855
 2021-06-28 16:52:38 +00:00
Christopher Tate
1bd2f52715 Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 am: cb8e4e8db6 am: 8ebf5ba96a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982641

Change-Id: I44501af02bca5415ab58cd05d352cde2aff4a8bb
 2021-06-28 16:52:26 +00:00
Hui Yu
bc54a29146 Merge "Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: e51f884f6a" into rvc-qpr-dev 2021-06-28 16:50:22 +00:00
Victor Chang
3f08270c64 Merge "Remove usage of Math.randomLongInternal" into sc-dev am: 604b00db37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015190

Change-Id: Ieffa659ec2928607185ecc51ba973e2e2ba589ce
 2021-06-28 16:47:41 +00:00
Victor Chang
604b00db37 Merge "Remove usage of Math.randomLongInternal" into sc-dev 2021-06-28 16:42:15 +00:00
Kweku Adams
972db49e02 Merge "Fix pending job sorting." into sc-dev am: 881da35724 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079631

Change-Id: Ia5d08f12a1670c3942c61eeb4fcc6a18cf52a720
 2021-06-28 16:35:17 +00:00
Alexander Dorokhine
9e2d4748f4 Merge "Port appsearch-service to the system_server_current sdk." into sc-dev am: e665d39fd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14638445

Change-Id: Ief772b8d81b07e7c238cc05a2c4caeeda10ad837
 2021-06-28 16:34:58 +00:00
TreeHugger Robot
be6ae18c83 Merge "Avoid unnecessary work." into sc-dev am: 6fc657d10f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114896

Change-Id: I6fb5bab268921b4efdda5c31e78ce71086113021
 2021-06-28 16:34:41 +00:00
Kweku Adams
881da35724 Merge "Fix pending job sorting." into sc-dev 2021-06-28 16:29:42 +00:00
Alexander Dorokhine
e665d39fd4 Merge "Port appsearch-service to the system_server_current sdk." into sc-dev 2021-06-28 16:27:55 +00:00
TreeHugger Robot
6fc657d10f Merge "Avoid unnecessary work." into sc-dev 2021-06-28 16:19:09 +00:00
Josh Tsuji
505bcb2a74 Merge "Add flags for new unlock and smartspace transition." into sc-dev am: bba0b75b8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15054108

Change-Id: I53b86fc67f27b2d102ab7728f9fd302bd1041461
 2021-06-28 15:52:07 +00:00
Josh Tsuji
bba0b75b8a Merge "Add flags for new unlock and smartspace transition." into sc-dev 2021-06-28 15:28:24 +00:00
Beth Thibodeau
8b8e8cc101 Merge "Adjust media layout to spec" into sc-dev am: 3e248c3e88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15099105

Change-Id: Iab370d51a4c165cc4573e011f4b8727784fd6061
 2021-06-28 15:22:30 +00:00
Beth Thibodeau
1deebe4097 Merge "Fix settings gear visibility" into sc-dev am: 32fe72cfb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15095286

Change-Id: I769f63836857d59d2a33996e577373dab2a9e6db
 2021-06-28 15:22:10 +00:00
Beth Thibodeau
3e248c3e88 Merge "Adjust media layout to spec" into sc-dev 2021-06-28 15:10:24 +00:00
Beth Thibodeau
32fe72cfb9 Merge "Fix settings gear visibility" into sc-dev 2021-06-28 15:09:20 +00:00
Caitlin Cassidy
5321180dfb Merge "[Ongoing Call Chip] Fix NPE if the notification doesn't have a content intent." into sc-dev am: 614e76dc22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067651

Change-Id: I24a0e7e9680245d42193284113fa4d37fc73405b
 2021-06-28 14:52:41 +00:00
Patrick Baumann
4c4aaf5669 Merge "Fixes incorrect array type comparison" into sc-dev am: 4fd129b588 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15109669

Change-Id: I456967db427440fe13313cd44ee5ac1a6c1dad44
 2021-06-28 14:52:08 +00:00
Caitlin Cassidy
614e76dc22 Merge "[Ongoing Call Chip] Fix NPE if the notification doesn't have a content intent." into sc-dev 2021-06-28 14:49:00 +00:00
Patrick Baumann
4fd129b588 Merge "Fixes incorrect array type comparison" into sc-dev 2021-06-28 14:41:01 +00:00
Yi-Ling Chuang
d0ade7ff10 Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev am: 99a680a50f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15124973

Change-Id: Iad40e905205c5b3d7de6c78566278cfa5a981fc4
 2021-06-28 14:22:26 +00:00
Yi-Ling Chuang
99a680a50f Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev 2021-06-28 14:14:12 +00:00
Anna Zappone
97bfa6b58a Merge "Create RemoteViews for all supported app widget sizes" into sc-dev am: 5ce1b8c6ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079800

Change-Id: Ie0536104c76393a5f3f5314437e1b3101a1efbb3
 2021-06-28 13:23:23 +00:00
TreeHugger Robot
bb0ca9c6ac Merge "Rename keylayout for SnakeByte iDroid:con to match by name" into sc-dev am: e4147d7370 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15120883

Change-Id: I0f96ac99c0714ec07a055d3428065ae50658cc90
 2021-06-28 13:22:42 +00:00
Anna Zappone
5ce1b8c6ef Merge "Create RemoteViews for all supported app widget sizes" into sc-dev 2021-06-28 13:11:03 +00:00
TreeHugger Robot
e4147d7370 Merge "Rename keylayout for SnakeByte iDroid:con to match by name" into sc-dev 2021-06-28 13:10:02 +00:00
Flavio Fiszman
7134c69139 Merge "Polish Conversations widget Configuration Activity strings" into sc-dev am: 17f6df5f03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15109570

Change-Id: I39cb6dc52fe7584fea081dd6383d459a453f4d7d
 2021-06-28 12:52:17 +00:00
Flavio Fiszman
17f6df5f03 Merge "Polish Conversations widget Configuration Activity strings" into sc-dev 2021-06-28 12:41:32 +00:00
TreeHugger Robot
14b014a4a2 Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev am: 7058f9948f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15098677

Change-Id: Ia10e176ac85576cc4527f60642ea625b938f9895
 2021-06-28 11:23:02 +00:00
TreeHugger Robot
7058f9948f Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev 2021-06-28 11:05:00 +00:00
Riddle Hsu
c7adb2d667 Merge "Separate trace of trampoline launch with different packages" into sc-dev am: 05e83c1ce9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15094231

Change-Id: I7cb223a7dd854f48b6a7156a017012489bbabb2a
 2021-06-28 10:55:43 +00:00
Riddle Hsu
05e83c1ce9 Merge "Separate trace of trampoline launch with different packages" into sc-dev 2021-06-28 10:44:58 +00:00
TreeHugger Robot
d0292b7119 Merge "Use DeviceConfig in MediaMetricsManagerService" into sc-dev am: d87df18092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027382

Change-Id: Idef2fa59a175c755e53c7d2bdf19ed1bb7d8d50c
 2021-06-28 10:15:53 +00:00
Yi-Ling Chuang
acf451f9a7 Make CollapsingToolbarBaseActivity extend FragmentActivity 
Since SettingsTransitionActivity is reverted, make
CollapsingToolbarBaseActivity extend FragmentActivity directly.

Bug: 191335572
Test: rebuild
Change-Id: I6eda699ec97f11f5a89a4bce7be041960c5d6e32
 2021-06-28 18:08:11 +08:00
TreeHugger Robot
d87df18092 Merge "Use DeviceConfig in MediaMetricsManagerService" into sc-dev 2021-06-28 09:58:51 +00:00
Stevie Kideckel
a3123584cc Merge "Add clipToOutline to the background views in people tile layouts" into sc-dev am: 52698a914e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107818

Change-Id: I6775fa42b297a54d654865a3f1e30578a77bfff5
 2021-06-28 09:17:43 +00:00
Stevie Kideckel
52698a914e Merge "Add clipToOutline to the background views in people tile layouts" into sc-dev 2021-06-28 09:07:56 +00:00
TreeHugger Robot
c53732b4f4 Merge "Export the instance of CoordinatorLayout" into sc-dev am: 6f383b1b8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15101226

Change-Id: Ifd49bb71c459cd6e92ebf106d94c8439ff3dc8ee
 2021-06-28 08:52:17 +00:00
TreeHugger Robot
6f383b1b8e Merge "Export the instance of CoordinatorLayout" into sc-dev 2021-06-28 08:35:04 +00:00
Bill Lin
950858bb30 Merge "Check shortcut enabled before auto trun on OHM" into sc-dev am: e606dcbecb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102775

Change-Id: Ifca32ef3b247e86b28050f82a1207c0581f72412
 2021-06-28 07:43:03 +00:00
Stanley Wang
459c478d10 Merge "Fix the problem that the switch should gray out when preference disabled." into sc-dev am: ef65dc4315 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15109464

Change-Id: I3dd20dc7722a232a32b49f3b739128752adc596d
 2021-06-28 07:41:23 +00:00