Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
620,585 Commits 3 Branches 0 Tags
56fbe0eb9c292677526759e792bfbb00e62ab025
Commit Graph

620585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anna Zappone
56fbe0eb9c Merge "Update PeopleTile & ConversationChannel" 2021-01-26 13:46:36 +00:00
Steven Ng
d8d8acfd9f Merge "Add a new widget feature value, configuration_optional" 2021-01-26 11:05:07 +00:00
Michal Olech
8d5fa098aa Merge changes I5ac00d59,I41a59081,I63c7cf35 
* changes:
  [CEC Configuration] Fix race condition with listeners
  [2.0] Disable sending <User Control Pressed> in attempts to change the active source to a 2.0 device
  [CEC Configuration] Add 'tv_wake_on_one_touch_play' option
 2021-01-26 10:51:23 +00:00
Nathalie Le Clair
1c9c511c88 Merge "Map power button on reference remote to KEYCODE_TV_POWER" 2021-01-26 09:51:23 +00:00
Philip Junker
2d4197c822 Merge "Set default value of config_longPressOnPowerBehavior in device/google/atv/overlay instead" 2021-01-26 09:28:45 +00:00
TreeHugger Robot
c79f0ed9d5 Merge "Enable Pip tests" 2021-01-26 09:28:36 +00:00
SongFerng Wang
816ef2dde1 Merge "Add getPhoneCapability function in TelephonyManager" 2021-01-26 07:46:55 +00:00
Rhed Jao
6f09b8dcae Merge "Do not adding ResolveInfo if no ephemeral installer" 2021-01-26 07:31:21 +00:00
Rhed Jao
41070cfa10 Merge "Fixes a crash when the instant app is launching" 2021-01-26 07:31:21 +00:00
SongFerng Wang
a0373dd123 Merge "Rename AllowedNetworkType to AllowedNetworkTypes" 2021-01-26 07:22:07 +00:00
Louis Chang
c516ebea83 Merge "Rename Stack to Task related terms (6/n)" 2021-01-26 06:48:29 +00:00
TreeHugger Robot
50b077d6f5 Merge "Signature verification for checksums." 2021-01-26 05:34:02 +00:00
Hui Yu
3f4545f062 Merge "Temp allowlist FGS start 10 seconds for broadcast ACTION_MY_PACKAGE_REPLACED." 2021-01-26 05:32:49 +00:00
Lucas Dupin
e6fee6030a Merge "Make bubble scrim respect opacity flag" 2021-01-26 05:29:20 +00:00
Lucas Dupin
91a6b4a457 Merge "Use regular text colors on empty shade" 2021-01-26 05:28:05 +00:00
Alex Buynytskyy
1d85df2d5e Signature verification for checksums. 
Bug: 160605420
Test: atest ChecksumsTest
Change-Id: Ia1cca0c678256defc2d3b781eb75494b9b17496d
 2021-01-26 04:57:37 +00:00
Benjamin Schwartz
3bf626d1cb Merge changes from topic "energyconsumer" 
* changes:
  Update BatteryExternalStatsWorker to use the new EnergyConsumerType
  Update to new version of PowerStats HAL 2.0
 2021-01-26 04:35:19 +00:00
Remi NGUYEN VAN
f5e542d64a Merge "Revert "Note network interfaces based on transport"" 2021-01-26 04:25:56 +00:00
Remi NGUYEN VAN
e1e8e9ec13 Revert "Note network interfaces based on transport" 
This reverts commit ef0d81b294.

Reason for revert: Broke build of tests: b/178441996

Change-Id: Idaf35fa02f76852fa8134b0d505467007f6d0f60
 2021-01-26 04:22:54 +00:00
Cn Chen
99f8a0d015 Merge "Add meterred string for wifi screen." 2021-01-26 03:59:28 +00:00
Nicholas Ambur
48900cae6a Merge changes from topic "edit-full-bat-saver-runtime" 
* changes:
  add full battery saver runtime modification API
  add CpuFrequencies to BatterySaverPolicy
 2021-01-26 03:54:57 +00:00
Jason Hsu
806e4e12a0 Merge "Add key ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED" 2021-01-26 03:44:37 +00:00
Remi NGUYEN VAN
e8fc199452 Merge "Note network interfaces based on transport" 2021-01-26 03:20:21 +00:00
Sungsoo Lim
a4c4512b95 Merge "Prevent multiple calls of ActivityThread.systemMain()" into rvc-qpr-dev am: de3b7f1aea am: c62ec99fec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13365411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad84dc3f7b46469509acd431185e346ec0fa3cf
 2021-01-26 03:11:54 +00:00
Louis Chang
89d04c4b3c Rename Stack to Task related terms (6/n) 
Update local variables and comments with Task terms.

No logical changes.

Bug: 157876447
Test: presubmit
Change-Id: Iffcd5ca8971fc8856775538c3eebcefef2cf4b24
 2021-01-26 10:51:26 +08:00
Hongming Jin
42982eeef8 Merge "Make the pending intent immutable." 2021-01-26 02:45:49 +00:00
Zoey Chen
1ea87b59fe Merge "[Telephony] Remove redundant code in PhoneStateListener" 2021-01-26 02:40:25 +00:00
Bill Yi
2c3c8d12e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 1dfbc75ba2 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f221fae2d2bf981fd029a96c6655eda0c53a45e
 2021-01-26 02:15:31 +00:00
Bill Yi
34eb897e49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 1be3d32626 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3adfc8a6346c532e38fc66de0350302d99b2cfe5
 2021-01-26 02:15:10 +00:00
Sungsoo Lim
c62ec99fec Merge "Prevent multiple calls of ActivityThread.systemMain()" into rvc-qpr-dev am: de3b7f1aea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13365411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad8fb5c18c68300b2c01548abd3798cfccb445a5
 2021-01-26 02:14:06 +00:00
Chilun Huang
937b533263 Merge "Merge AppWindowTokenTests into ActivityRecordTests" 2021-01-26 02:11:39 +00:00
Calin Juravle
b059b3faa0 Merge "Update boot image and system server profiles [M5C5P85S0PP]" 2021-01-26 02:11:04 +00:00
Bill Yi
1dfbc75ba2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-01-26 02:04:12 +00:00
Bill Yi
3db22c5d3d Merge changes from topic "presubmit-am-5ba3486b632e487496935dd840e7c73f" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8b10384121
  Import translations. DO NOT MERGE ANYWHERE
 2021-01-26 02:04:12 +00:00
Bill Yi
1be3d32626 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-01-26 01:41:40 +00:00
Bill Yi
24781385c5 Merge changes from topic "presubmit-am-5b38289dda7f4aa38d93a9a4527ce381" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3771a9fd37
  Import translations. DO NOT MERGE ANYWHERE
 2021-01-26 01:41:40 +00:00
Sungsoo Lim
de3b7f1aea Merge "Prevent multiple calls of ActivityThread.systemMain()" into rvc-qpr-dev 2021-01-26 01:39:30 +00:00
SongFerngWang
13d5297155 Add getPhoneCapability function in TelephonyManager 
- Add a resource for Device's Nr information.
- Expose below as systemApi
  - getDeviceNrCapabilityBitmask()
  - getMaxActiveInternetData()
  - getMaxActivePacketSwitchedVoiceCalls()
Bug: 175711587
Test: atest TelephonyManager#testGetPhoneCapability
atest PhoneCapabilityTest
atest PhoneConfigurationManagerTest
atest CellularNetworkValidatorTest
atest PhoneSwitcherTest
atest TelephonyRegistryTest
atest PhoneCapabilityTest

Change-Id: Ide25344787c15b3a57a9e6621766ad02a906f12e
 2021-01-26 09:24:28 +08:00
Michael Wachenschwanz
32d103d0db Update BatteryExternalStatsWorker to use the new EnergyConsumerType 
EnergyConsumerId has been replaced with EnergyConsumerType and an ordinal int to determine an EnergyConsumer type

Bug: 178048034
Test: manual ("adb shell dumpsys batterystats --measured-energy" on
PowerStatshal2.0 enabled devices should report energy consumption data
while on battery)

Change-Id: Ie78b46fcb59d0327c00a20fbe2481dc537b910eb
 2021-01-26 01:11:37 +00:00
Jeff Sharkey
43150f4ac0 Merge "Quietly pivot to default values." 2021-01-26 01:11:21 +00:00
Mat Bevilacqua
6058dc2190 Update to new version of PowerStats HAL 2.0 
Bug: 178048034
Test: atest FrameworksServicesTests:PowerStatsServiceTest
Change-Id: I714d2037a3576a3f6f89211d64ccf88cefa51abf
 2021-01-25 17:09:05 -08:00
Amy Zhang
0ab2c980fb Merge "Connect onFilterEvent of TunerFilterCallback in FilterClient" 2021-01-26 00:54:40 +00:00
Calin Juravle
e8b91349d5 Merge "Update boot image profiles OWNERS" am: 547556cfb7 am: b7ae05e92b am: 15ad2d977b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb424b52bc26749c9287b9252db5f10601c16c9e
 2021-01-26 00:47:52 +00:00
Hai Shalom
d38ef33671 [automerger skipped] Merge "Shift stringslint to using python3." am: 785a55ff0c am: ac6c441667 am: dfa03a290b -s ours 
am skip reason: Change-Id I354ef4b12c75505a069fdf657ab98a9b122785c7 with SHA-1 85ccd04180 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I484d38307880a227eec1a4ea9e4a94b5a9b06e87
 2021-01-26 00:47:18 +00:00
Lucas Dupin
b22f9f377f Use regular text colors on empty shade 
Bug: 174851270
Test: visual
Change-Id: I4849cdd526f0808cc10933148775810aabc4fc9b
 2021-01-25 16:46:46 -08:00
Jeff Sharkey
6958f2d1fd Merge "Add the owner for those files related to voice." am: 24bbd50cea am: 2a0549bc14 am: 6b2d1bb8c4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I660a71a3f58a74bbcb50f22d363912ba35f56ff6
 2021-01-26 00:46:41 +00:00
Jordan Liu
7a58fa1702 [automerger skipped] Merge "Add carrier config for carrier key" am: 11dff58d5e am: b24ba046ee am: b5dab85753 -s ours 
am skip reason: Change-Id I89d88daf2022672bf27125baae0247b75638bb6e with SHA-1 762fe4b0e0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88c0920510bbfe1ad403346f4d615f9f0ce6e020
 2021-01-26 00:46:10 +00:00
Jeffrey Vander Stoep
c3a696c11f Merge "Add alanstokes@ to privileged permissions OWNERS" am: bb448f504f am: e5bf14e7aa am: c819062e8c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0291ba4d4e357e2ede73beba432290c23e2cf220
 2021-01-26 00:45:03 +00:00
Evan Rosky
27923b5a68 Merge "Add support/adapter for recents animation via shell transition" 2021-01-26 00:29:40 +00:00
Lucas Dupin
2107c5815f Make bubble scrim respect opacity flag 
Test: atest ScrimControllerTes
Fixes: 173562716
Change-Id: If815eb75f63078741f2b1104938b223e0a99df31
 2021-01-25 16:27:14 -08:00