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

627733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Junyu Lai
26050067a1 Merge "[FUI23] Remove getNetworkQuotaInfo" am: 0bb7932183 am: 6da7e8ca6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fcee361d93fca76a146e4ca7dd028f7f89f59a1
 2021-03-05 11:56:03 +00:00
Treehugger Robot
db3769c465 Merge "Set SAM according to TV's settings" 2021-03-05 11:55:58 +00:00
Remi NGUYEN VAN
e878fb157a Merge "Move NetworkState to Connectivity" am: d0355e1be2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5596793757dff3d5e49a6b0c42b0935550f47abe
 2021-03-05 11:26:53 +00:00
Gavin Corkery
7bbe2475fe [automerger skipped] Merge "Add immutability flag to PendingIntents" into rvc-qpr-dev-plus-aosp am: 8699e31071 -s ours 
am skip reason: Change-Id Iae1489b9c8fa323448e60615e99ad96aee1cd1d7 with SHA-1 2d38f6e4f0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I097461d2753500ad5180f8f0401b1f17d90ec570
 2021-03-05 11:23:48 +00:00
Junyu Lai
6da7e8ca6c Merge "[FUI23] Remove getNetworkQuotaInfo" am: 0bb7932183 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9859af9354534b53233018d110c438212ec2017b
 2021-03-05 11:23:38 +00:00
TreeHugger Robot
c74a9955d5 Merge "Revert "Revert "Revert "Revert "Turn on the feature flag for And..."" into sc-dev 2021-03-05 11:15:02 +00:00
Chiachang Wang
339a9d2997 Merge "Update package of DataConnectionStats" into sc-dev 2021-03-05 10:56:30 +00:00
Gavin Corkery
8699e31071 Merge "Add immutability flag to PendingIntents" into rvc-qpr-dev-plus-aosp 2021-03-05 10:41:30 +00:00
Remi NGUYEN VAN
d0355e1be2 Merge "Move NetworkState to Connectivity" 2021-03-05 10:27:57 +00:00
Naomi Musgrave
ac754912ca Merge "Update WindowManager's WindowMetrics documentation" into sc-dev 2021-03-05 10:23:55 +00:00
Treehugger Robot
dfc3abdf72 Merge "Update NPMS to listen for all uid procstate changes." 2021-03-05 10:23:27 +00:00
Rubin Xu
857272f576 Merge "Return copy of pending token list" into sc-dev 2021-03-05 10:22:19 +00:00
Junyu Lai
0bb7932183 Merge "[FUI23] Remove getNetworkQuotaInfo" 2021-03-05 10:05:06 +00:00
Alex Johnston
4183c1d4a7 Merge "AppUriAuthenticationPolicy and UrisToAliases equals and hashcode" into sc-dev 2021-03-05 09:31:15 +00:00
Aaron Huang
be50d6054b [automerger skipped] Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 918e60b615 am: 3fe7534d30 am: f3fb6b3099 -s ours 
am skip reason: Change-Id I3dac94ec06f673aa719e124f1ef3d8169f68f9fb with SHA-1 cfff482b8a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib458f32902e64c63fc1fc9e2bb5bf92be801916b
 2021-03-05 09:04:17 +00:00
TreeHugger Robot
00964166f4 Merge "Fix incorrect usage of sparse array" into sc-dev 2021-03-05 08:58:55 +00:00
Aaron Huang
f3fb6b3099 Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 918e60b615 am: 3fe7534d30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide9ccdb7a50e3d674cb85dfffa014c89ee52db3e
 2021-03-05 08:23:08 +00:00
Aaron Huang
3fe7534d30 Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 918e60b615 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6fd08a8ba2bcbe4a955c245f49be517794f8a91
 2021-03-05 07:45:53 +00:00
Eric Laurent
a954e2dc75 Merge "audio:Suppress device volume to safe volume" into sc-dev 2021-03-05 07:40:43 +00:00
Wei Sheng Shih
eca2cee8fd [automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." am: cc1e7da83c am: 9571fc99b5 am: 207b28c7bb -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4f71c460136071ba65ba0bd2457332f5821b189
 2021-03-05 07:11:29 +00:00
wilsonshih
a45d513c44 [automerger skipped] [RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen. am: 413456e640 am: 27cc5ded70 am: 90d42f5865 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d6c02e1b0f1857ebf8ad17b9daead6f6edb0e2d
 2021-03-05 07:11:20 +00:00
Treehugger Robot
f34a8e1bb2 Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 4c73e05c1d am: 1e1379b245 am: ee3fc01443 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52f8339bd1cda35a3f26f28fd3c0165f6f6ff91e
 2021-03-05 07:10:46 +00:00
Remi NGUYEN VAN
072e6e15be Merge "Replace user with debuggable check in ConnectivityService" am: 8773546980 am: ad5abee88b am: ed45defb30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c8746e54e1461c54f8064f9fd016361b5f2e6ef
 2021-03-05 07:10:18 +00:00
Chalard Jean
c98f30af66 Merge "Generalize some PANS methods" am: fcbc6ff6b1 am: b2bc755a59 am: 83541f6a1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee4826c66d5187608d0afa8f23fa45f1efe34a2b
 2021-03-05 07:09:15 +00:00
Treehugger Robot
34fe7c1b58 Merge "Make VCN network policy listener oneway" am: dd2877eabe am: 6a95ca0b62 am: 00b31c836d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fce372f232d97b9df5e61c020bcc2932a77292e
 2021-03-05 07:07:54 +00:00
Arthur Hung
e13da78c16 Merge "Introduce SingleKeyGestureDetector to PhoneWindowManager" into sc-dev 2021-03-05 07:05:15 +00:00
Aaron Huang
918e60b615 Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" 2021-03-05 07:03:51 +00:00
Sakar Khattar
6196df1f2b Merge "Copy SurfaceControl object for inprocess calls from WindowlessWindowManager to WindowManager" into sc-dev 2021-03-05 06:55:53 +00:00
Sudheer Shanka
b5127c0713 Update NPMS to listen for all uid procstate changes. 
This is a temporary change until we can fix an issue
in AMS internally.

Bug: 177641226
Test: treehugger
Change-Id: I7d04b4116f8ecb7da8c3fb0b9229a8896b836811
Merged-In: I888764ff22fba92fe2cccf3d8442ed318a19ad2a
 2021-03-05 06:36:31 +00:00
Wei Sheng Shih
207b28c7bb Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." am: cc1e7da83c am: 9571fc99b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8ed3b6acc63defd973c042a879eaefd8850fd65
 2021-03-05 06:35:52 +00:00
wilsonshih
90d42f5865 [RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen. am: 413456e640 am: 27cc5ded70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3ffaa4fea8a0ab2600db5efec0533f3ff47ce7b
 2021-03-05 06:35:49 +00:00