Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
627,788 Commits 3 Branches 0 Tags
71ecb60a5a842579ffca8e994bfd533deeeb4d93
Commit Graph

627788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
71ecb60a5a Merge "Camera: Add multi-resolution image reader and reprocessing support" into sc-dev 2021-03-05 20:14:08 +00:00
Jeff DeCew
55f7019463 Merge "Fix image crossfade animation of left icon in groups." into sc-dev 2021-03-05 20:12:14 +00:00
Kevin Chyn
0a989d79fc Merge changes I91d720d3,Ibfdc40d4 into sc-dev 
* changes:
  Update Udfps fingerprint icon size
  Add UDFPS enrollment moving target
 2021-03-05 20:02:58 +00:00
TreeHugger Robot
c8f4f70efd Merge "Fix NPE crashes during UDFPS BiometricPrompt" into sc-dev 2021-03-05 19:52:19 +00:00
Terry Wang
42bac3b186 Merge "Split getAppSearchImpl and createAppSearchImpl in AppSearchImpl" into sc-dev 2021-03-05 19:27:31 +00:00
Danny Epstein
7a3134cd7a Merge "Configure privapp perms for rotary service" into sc-dev 2021-03-05 19:26:51 +00:00
Winson Chung
88c5179965 Merge "Revert "Add nav bar case to RemoteAnimationTarget of non-app window"" into sc-dev 2021-03-05 19:03:30 +00:00
TreeHugger Robot
d6973bfc1e Merge "Fix some legacy-transition timing issues in split-screen" into sc-dev 2021-03-05 18:58:34 +00:00
Treehugger Robot
91fb524a4f Merge "Don't crash if the MediaCodecList is null." am: f80c56df73 am: ac569866d9 am: e0c584e656 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ef505c00d87f48c5af36d37a9570906d559889b
 2021-03-05 18:13:34 +00:00
TreeHugger Robot
5cb735bfb6 Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev am: 91568eb50e am: 485249abd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13288128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I566259b63f76a79795f604d3409ff2547995f9ba
 2021-03-05 18:12:43 +00:00
Automerger Merge Worker
ad6fd2a894 Merge changes from topic "am-5c809b0f931842e5aa0800f5e2d57308" into sc-dev 
* changes:
  [automerger skipped] Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev am: 53107b6e79 am: 267b7d49d3 -s ours
  [automerger skipped] DO NOT MERGE Add generic rotary support for sysui overlay window am: e076c2344e am: baef70ab50 -s ours
 2021-03-05 18:12:35 +00:00
Heemin Seog
f8481c6dd3 [automerger skipped] Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev am: 53107b6e79 am: 267b7d49d3 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib35dd7f9e988d463ab97c8fb167281fe5f8eeb6c
 2021-03-05 18:12:25 +00:00
Jeff Sharkey
34229aaf73 Merge "General BytesMatcher utility class." into sc-dev 2021-03-05 18:12:15 +00:00
Heemin Seog
900932b6d8 [automerger skipped] DO NOT MERGE Add generic rotary support for sysui overlay window am: e076c2344e am: baef70ab50 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b770ce33350fef0dbd08a9af1f9f8719e51c1d8
 2021-03-05 18:12:15 +00:00
Treehugger Robot
e0c584e656 Merge "Don't crash if the MediaCodecList is null." am: f80c56df73 am: ac569866d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef5f798a545f21752b56d6a3134f3179d323734
 2021-03-05 18:08:04 +00:00
Fiona Campbell
faa55308ea Merge "Ensure valid brightness is sent to surface control" into sc-dev 2021-03-05 17:52:49 +00:00
Lee Shombert
a57c2b816e Merge "Update IntentResolver snapshots" into sc-dev 2021-03-05 17:38:28 +00:00
Sally Yuen
515057f70d Merge "Service requests can interrupt node prefetching" into sc-dev 2021-03-05 17:27:51 +00:00
TreeHugger Robot
485249abd1 Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev am: 91568eb50e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13288128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ebe7a1a4da45b4e238de50aa21691afffa30203
 2021-03-05 17:18:59 +00:00
Treehugger Robot
ac569866d9 Merge "Don't crash if the MediaCodecList is null." am: f80c56df73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf695842ec6461e65861f5d541ea6ff237a1bc8a
 2021-03-05 17:18:27 +00:00
Heemin Seog
267b7d49d3 Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev am: 53107b6e79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13714485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaad15dd515eb550965a9acfb00c9e14f29513d1
 2021-03-05 17:18:10 +00:00
Heemin Seog
baef70ab50 DO NOT MERGE Add generic rotary support for sysui overlay window am: e076c2344e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13714485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea8554941ceb6197115feca7c7d3b55fab0fbdb3
 2021-03-05 17:17:51 +00:00
TreeHugger Robot
91568eb50e Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev 2021-03-05 17:10:19 +00:00
Alex Buynytskyy
66a4de0653 Merge "Detect missing page reads." into sc-dev 2021-03-05 17:08:56 +00:00
Evan Rosky
86234a6ebd Merge "Abstract some transition checks so they can be expanded." into sc-dev 2021-03-05 16:48:32 +00:00
Heemin Seog
53107b6e79 Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev 2021-03-05 16:47:48 +00:00
Kweku Adams
b2832745cc Merge "Small JS code cleanup." into sc-dev 2021-03-05 16:47:40 +00:00
Treehugger Robot
f80c56df73 Merge "Don't crash if the MediaCodecList is null." 2021-03-05 16:42:29 +00:00
James O'Leary
c4748fdab2 Merge "Fix crash when number of pixels < max colors" into sc-dev 2021-03-05 16:25:06 +00:00
Zoey Chen
af1e8b4ea9 Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part1" into sc-dev 2021-03-05 14:50:27 +00:00
Zoey Chen
10f6aef3b5 Merge "[PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback" into sc-dev 2021-03-05 14:43:52 +00:00
Kholoud Mohamed
f3d4c0f977 Merge "Fix bug in UserManager#getUserName" into sc-dev 2021-03-05 14:20:50 +00:00
Alexander Potapenko
493a8a1ad0 Merge changes from topic "kernel_bootreceiver" into sc-dev 
* changes:
  BootReceiver: collect kernel memory corruptions from dmesg
  BootReceiver: move to services/core/java/com/android/server
 2021-03-05 14:09:39 +00:00
Beverly Tai
df0c9f0d4d Merge "Fix NPE on dozeTimeTIck" into sc-dev 2021-03-05 14:04:13 +00:00
TreeHugger Robot
26d34a403d Merge "wifi: add WPA3 Enterprise definition" into sc-dev 2021-03-05 13:58:28 +00:00
Galia Peycheva
7902e32172 Fix dimmer bug in WindowState 
If no dim is not enabled, but there is blur behind requested, the
Dimmer should be invoked with dimAmount 0 and the requested blur
behind radius.

Bug: 167166562
Test: atest BlurTests
Change-Id: Ief98a6ac664c002b7cc9c13aa77ad727ad583465
 2021-03-05 13:53:33 +00:00
Zoey Chen
543116fc71 Merge "[Telephony] Remove the dead code setRadioCapability in ITelephony" am: d22eced34b am: 18451a325d am: 83228fef36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a64f7a0db225906e05821b79c3da4d592cb9ea1
 2021-03-05 13:52:06 +00:00
Treehugger Robot
55978fbc04 Merge "Set SAM according to TV's settings" am: db3769c465 am: 31444d7845 am: f8d2ecebb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d0247a8bb96a721888c0d41d750bf79bfd5b09b
 2021-03-05 13:51:43 +00:00
Stanislav Zholnin
0f8bab9ea4 Merge "Remove references to Discrete Register from AppOpsService." into sc-dev 2021-03-05 13:51:30 +00:00
Zoey Chen
83228fef36 Merge "[Telephony] Remove the dead code setRadioCapability in ITelephony" am: d22eced34b am: 18451a325d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93967747b496f35815aeb0af0b3cc19ffebb92a4
 2021-03-05 13:47:27 +00:00
Sean Stout
084f08258d Merge "Pass Display ID when reporting user activity from Java" into sc-dev 2021-03-05 13:24:10 +00:00
Treehugger Robot
f8d2ecebb8 Merge "Set SAM according to TV's settings" am: db3769c465 am: 31444d7845 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf9281d61d6565b34c75189d9ba09d3daa460801
 2021-03-05 13:05:28 +00:00
Zoey Chen
18451a325d Merge "[Telephony] Remove the dead code setRadioCapability in ITelephony" am: d22eced34b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40e0b44264ff86370861a17e801966e1d2ebcece
 2021-03-05 13:04:40 +00:00
Zoey Chen
d22eced34b Merge "[Telephony] Remove the dead code setRadioCapability in ITelephony" 2021-03-05 12:35:39 +00:00
Remi NGUYEN VAN
1623f60d39 Merge "Move NetworkState to Connectivity" am: d0355e1be2 am: e878fb157a am: 161b1278f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icea1247fd498e8661cb8cba68d34a443004a246d
 2021-03-05 12:32:57 +00:00
Treehugger Robot
ec83e7048e [automerger skipped] Merge "Update NPMS to listen for all uid procstate changes." am: dfc3abdf72 am: e91f7deefa am: 0d260e60b4 -s ours 
am skip reason: Change-Id I888764ff22fba92fe2cccf3d8442ed318a19ad2a with SHA-1 6831749cb4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5973e271ce07c81ac37f553f062ab4da3973e9f
 2021-03-05 12:32:40 +00:00
Junyu Lai
f2a3d989a0 Merge "[FUI23] Remove getNetworkQuotaInfo" am: 0bb7932183 am: 6da7e8ca6c am: 26050067a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ideacbf9babef892b5906717ab7778e861a5698bd
 2021-03-05 12:31:36 +00:00
Treehugger Robot
31444d7845 Merge "Set SAM according to TV's settings" am: db3769c465 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60758e5982232d79bd33066d21ee393ae7dd9d08
 2021-03-05 12:28:14 +00:00
Remi NGUYEN VAN
161b1278f7 Merge "Move NetworkState to Connectivity" am: d0355e1be2 am: e878fb157a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f87db84ac7d49c7f781ff9bd188f90dac54db8e
 2021-03-05 11:56:39 +00:00
Treehugger Robot
0d260e60b4 Merge "Update NPMS to listen for all uid procstate changes." am: dfc3abdf72 am: e91f7deefa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5208b7648e99ead1b1329f32f1d9b9774a511c60
 2021-03-05 11:56:30 +00:00