Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
628,148 Commits 3 Branches 0 Tags
2cb1dabc492a5d712193146bc2469caf0796cc00
Commit Graph

628148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cody Kesting
2cb1dabc49 Merge changes I14740854,Id1c2dc28,I4168c868 am: 3b0cb56475 am: 06085e6ab3 am: f5d4826ef1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied6022110fd73b4880a4a34caba03ae821e111a7
 2021-03-09 03:03:56 +00:00
TreeHugger Robot
ac22dc0c1b Merge "powerstats: Print exception message in wrapper" into sc-dev 2021-03-09 02:55:41 +00:00
Remi NGUYEN VAN
92d9a9a796 Merge "New API for comparing two intents of PendingIntent object." into sc-dev 2021-03-09 02:45:30 +00:00
Kevin Chyn
09ae6273d0 Merge changes from topic "udfps-transition" into sc-dev 
* changes:
  Hide Udfps Overlay together with system transitions
  Slight cleanup for UdfpsController
 2021-03-09 02:26:15 +00:00
Cody Kesting
f5d4826ef1 Merge changes I14740854,Id1c2dc28,I4168c868 am: 3b0cb56475 am: 06085e6ab3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60fd6aea35944751476e2727936e7988c89de442
 2021-03-09 02:19:16 +00:00
Songchun Fan
a68ff5dc22 Merge "[incremental] update owners file for incremental service" am: bc92c6eb23 am: 2432332a16 am: 3aa5e72742 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I153b9550f14698441fb9fedc1fdfa20215e08d05
 2021-03-09 02:00:44 +00:00
Chilun Huang
6cd1cb58f7 Merge "Introduce ConfigurationController" into sc-dev 2021-03-09 01:58:58 +00:00
Josh Tsuji
e3c4133374 Merge "Land PIP softly (using the same physics settings as Bubbles)." into sc-dev 2021-03-09 01:44:53 +00:00
Cody Kesting
06085e6ab3 Merge changes I14740854,Id1c2dc28,I4168c868 am: 3b0cb56475 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I299178722859a6f0dc1beb6cc41890c63fbf6d0f
 2021-03-09 01:38:49 +00:00
Songchun Fan
3aa5e72742 Merge "[incremental] update owners file for incremental service" am: bc92c6eb23 am: 2432332a16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie27abab674040fdd98e01b890285aa814c4d57ba
 2021-03-09 01:16:01 +00:00
bsears
16f9372534 Merge "Revert "Send display-OFF event if that is initial state."" into sc-dev 2021-03-09 01:09:04 +00:00
Cody Kesting
3b0cb56475 Merge changes I14740854,Id1c2dc28,I4168c868 
* changes:
  Use clean identity for all calls in/out of VcnMgmtSvc.
  Exit Safe Mode when a VCN gets new configs.
  Notify VcnStatusCallbacks for VCN start/stop.
 2021-03-09 00:57:57 +00:00
Benjamin Schwartz
80ec0f804a powerstats: Print exception message in wrapper 
Bug: 182092453
Test: Presubmit
Change-Id: I0feed3dc1c6afa8bec1afa651e75b243a18441eb
 2021-03-08 16:38:39 -08:00
Songchun Fan
2432332a16 Merge "[incremental] update owners file for incremental service" am: bc92c6eb23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c417309ab56f94bf823f550a304a900c9ef5c52
 2021-03-09 00:38:30 +00:00
TreeHugger Robot
4034fc557c Merge "Set conversation icon x at shelf start when fading into shelf" into sc-dev 2021-03-09 00:23:40 +00:00
Alex Salo
20e43f73b3 Merge "Fix long press auto rotate implementation bug" into sc-dev 2021-03-09 00:15:43 +00:00
Songchun Fan
bc92c6eb23 Merge "[incremental] update owners file for incremental service" 2021-03-08 23:57:53 +00:00
Michael Wachenschwanz
b95b1a2eff Merge changes from topic "cpuEnergyAttribution" into sc-dev 
* changes:
  Accumulate charge instead of energy in BatteryStatsImpl
  Accumulate and attribute measured Cpu energy in BatteryStats
 2021-03-08 23:46:08 +00:00
TreeHugger Robot
7af559a69d Merge "Add alpha back to bubble scrim" into sc-dev 2021-03-08 23:41:35 +00:00
TreeHugger Robot
9857a76c09 Merge "Fixed mark-profile-owner-on-organization-owned-device for non-profile users" into sc-dev 2021-03-08 23:29:26 +00:00
Hui Wang
4e50cf240d Merge "Update Provisioning API name and doc per API review" am: 629a24b258 am: f622e0e38e am: c4cac7bb2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18889597b789affb869ea0cc1a78366e681e6e70
 2021-03-08 23:24:27 +00:00
Hongwei Wang
63b565d61f Merge "Use SyncTransactionQueue in PiP" into sc-dev 2021-03-08 23:05:20 +00:00
Hui Wang
c4cac7bb2d Merge "Update Provisioning API name and doc per API review" am: 629a24b258 am: f622e0e38e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91fbcc91ae746b4008c5028a4ce40d65236300cd
 2021-03-08 22:59:09 +00:00
Hans Boehm
be1e8edca3 Merge "No longer call registerNativeAllocation" am: 0272e96327 am: e8d010e9ec am: 0c42ad0ca7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621426

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34d58d2399064b5f66c4f6bfcdb8743bbae25685
 2021-03-08 22:40:57 +00:00
Guliz Tuncay
4fadd2013f Merge "Migrate wellbeing to use role" into sc-dev 2021-03-08 22:27:55 +00:00
Hui Wang
f622e0e38e Merge "Update Provisioning API name and doc per API review" am: 629a24b258 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica3fad113ed39075cefa6f876a18f2badc2ca15c
 2021-03-08 22:16:39 +00:00
Sally Yuen
8a070bb465 Merge "Revert "Service requests can interrupt node prefetching"" into sc-dev 2021-03-08 22:04:17 +00:00
Hui Wang
629a24b258 Merge "Update Provisioning API name and doc per API review" 2021-03-08 22:02:20 +00:00
Josh Tsuji
add6ea4e16 Land PIP softly (using the same physics settings as Bubbles). 
Test: fling a bunch of pips
Bug: 169863897
Change-Id: I115bcf7adc34852612646bd9cf220af62e06c4d3
 2021-03-08 16:55:06 -05:00
Hans Boehm
0c42ad0ca7 Merge "No longer call registerNativeAllocation" am: 0272e96327 am: e8d010e9ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621426

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55dba34e9de72cc288c838609638bb0ccb67e7c4
 2021-03-08 21:54:42 +00:00
Felipe Leme
8cf30ff9c7 Fixed mark-profile-owner-on-organization-owned-device for non-profile users 
It was throwing a NPE as such users are "orphan".

Test: adb shell dpm mark-profile-owner-on-organization-owned-device com.afwsamples.testdpc/.DeviceAdminReceiver
Fixes: 182189140
Change-Id: Ib02d767a23c53c1c2886728c2f338628149f7868
 2021-03-08 13:49:06 -08:00
Mady Mellor
c31ddde1df Add alpha back to bubble scrim 
Test: atest ScrimControllerTest
Test: manual - expand bubble stack, observe scrim
Fixes: 181791886
Change-Id: I254856cd9f0775bb52cb47197d78e40d78853b38
 2021-03-08 13:43:46 -08:00
James O'Leary
d96ed76ddc Merge "Fix boot time regression on Wembley" into sc-dev 2021-03-08 21:33:37 +00:00
TreeHugger Robot
e32ebc9312 Merge "Better error message for missing page reads." into sc-dev 2021-03-08 21:27:53 +00:00
Mady Mellor
e15c6dd81a Merge changes from topic "mm_setSuppress" into sc-dev 
* changes:
  SysUI changes for setSuppressBubble
  Track locusId visibility in ShellTaskOrganizer
  Add locus id to ActivityRecord / TaskInfo
  Bubble API: suppress bubble
 2021-03-08 21:27:36 +00:00
Hans Boehm
e8d010e9ec Merge "No longer call registerNativeAllocation" am: 0272e96327 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621426

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84dd87405e09cbdf32a8fa0898a7c68069802958
 2021-03-08 21:24:00 +00:00
Songchun Fan
cc22a26acf Merge "[incremental] add feature test to presubmit" into sc-dev 2021-03-08 21:14:00 +00:00
Winson Chiu
5ce8750fad Merge changes I60fdb050,Ia87bf657,If8229962 into sc-dev 
* changes:
  Include current profile browsers when resolving cross profile
  Only allow forwarding of Intents that MATCH_DEFAULT_ONLY
  Use correct parentUserId when using cross profile domain verification
 2021-03-08 21:02:51 +00:00
Peter Kalauskas
9568bbdc50 Merge "Use correct string resource for "Remove"" into sc-dev 2021-03-08 20:53:46 +00:00
Hans Boehm
0272e96327 Merge "No longer call registerNativeAllocation" 2021-03-08 20:48:11 +00:00
Sean Stout
632e4351ae Merge "Modify multi-display Activity launching behavior" into sc-dev 2021-03-08 20:47:17 +00:00
Cody Kesting
061b3bd32b Merge "Use actual Wifi subId when applying Network policies." into sc-dev 2021-03-08 20:29:07 +00:00
TreeHugger Robot
b28ad521cf Merge "Avoid unnecessary smaps logic during app compaction" into sc-dev 2021-03-08 20:08:48 +00:00
TreeHugger Robot
8923066718 Merge "powerstats: Add null checks to clients of power stats api" into sc-dev 2021-03-08 20:06:46 +00:00
Kevin Han
50ccbcd5f4 Merge "Unhibernate when an app is no longer force-stopped." into sc-dev 2021-03-08 20:04:09 +00:00
Songchun Fan
f62891726d [incremental] update owners file for incremental service 
Test: N/A
BUG: 174932174
Change-Id: I8cb5797b880861a9a67678f820035b77924abf12
 2021-03-08 20:00:37 +00:00
Cody Kesting
bf1139a93c Use clean identity for all calls in/out of VcnMgmtSvc. 
This CL updates VcnManager and VcnManagementService to use a clean
calling identify for handling all code paths entering and leaving the
System Server.

Bug: 180451994
Bug: 182183302
Test: atest FrameworksVcnTests
Change-Id: I147408544531927ecaf5e40af6cb139342f5cd63
 2021-03-08 11:58:54 -08:00
TreeHugger Robot
e328d7006c Merge "DPMS logging improvements." into sc-dev 2021-03-08 19:57:37 +00:00
TreeHugger Robot
f349d18f17 Merge "Do not allow FGS starts from sync" into sc-dev 2021-03-08 19:54:05 +00:00
Michael Wachenschwanz
68b8157e4e Accumulate charge instead of energy in BatteryStatsImpl 
Track battery voltage along side the measured energy to calculate
battery charge consumption per EnergyConsumer. This better represents
a consumer's impact on battery. Also change numerous variable/method
names from energy units to charge units.

Bug: 180079165
Fixes: 173765509
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest ScreenPowerCalculatorTest
Test: atest FrameworksServicesTests:com.android.server.am.MeasuredEnergySnapshotTest

Change-Id: I5e727cebf1252cc7b1645a53282de2281c68ae85
 2021-03-08 11:53:59 -08:00