Commit Graph

626341 Commits

Author SHA1 Message Date
Dmitri Plotnikov
5ab97fffe0 Break out battery history reading into a separate class
This class will be used by BatteryUsageStats

Bug: 180765532
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryIteratorTest

Change-Id: Ic392bcdb6eb815afcc3cd882aa32dd4c78b6484f
2021-02-28 10:34:01 -08:00
Yuncheol Heo
0c1a6ec3f2 Merge "Fix NPE in DisplayPowerController." into sc-dev 2021-02-28 15:08:22 +00:00
Sudheer Shanka
3a68193737 Merge "Update the order in which we apply new proc_state/oom_adj values." into sc-dev 2021-02-28 11:28:57 +00:00
Yohei Yukawa
9e028b322a Merge "Make "adb shell cmd input_method tracing" official" into sc-dev 2021-02-28 07:36:02 +00:00
Dmitri Plotnikov
7fa1f6129e Merge "Remove support for OLD_HISTORY" into sc-dev 2021-02-28 06:01:04 +00:00
TreeHugger Robot
0bfe15b58c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-28 01:06:40 +00:00
Bill Yi
a3a856be3e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0037b34f5a76e9fa74a25b4db58a5deed5ce174c
2021-02-27 20:16:22 +00:00
TreeHugger Robot
f98091f2e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-27 16:47:34 +00:00
Jeff DeCew
1c05dbcd2b Merge "Fixes Copyright date & incorrect a11y announcement" into sc-dev 2021-02-27 16:37:30 +00:00
Julia Reynolds
5db5a6ae40 Merge "Adds an NLS api for telling the OS what notifs types they bridge" into sc-dev 2021-02-27 15:34:34 +00:00
Bill Yi
a7d6179c19 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ed49146882593db8b8982a5e34e92efaf5e9ebb
2021-02-27 06:02:56 -08:00
Kyunglyul Hyun
b8407d691c Merge "[Media ML] Let MCS manage MediaSession2" into sc-dev 2021-02-27 06:43:58 +00:00
TreeHugger Robot
7d4e773f18 Merge changes from topic "presubmit-am-eaa6dc71b50c4c6fa8ae3801f2e77aeb" into sc-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b27f4465bd
  Import translations. DO NOT MERGE ANYWHERE
2021-02-27 04:53:13 +00:00
Chris Li
dfb9bb76fe Merge "Don't launch orientation-matching unresizable apps in freeform" into sc-dev 2021-02-27 04:23:57 +00:00
Bill Yi
b584adbfeb [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b27f4465bd
Blank merge reason: commit message contains skip directive

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

Change-Id: Idd1e889bb641c22bbcac955ea750c2fde3c4e827
2021-02-27 03:23:25 +00:00
Bill Yi
b27f4465bd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0b1f11a3ab06fa02a087cb9f8d9186a702e8df74
2021-02-27 03:23:04 +00:00
Jeff DeCew
6cd5cb738d Merge changes I57fb542a,If2a13daf into sc-dev
* changes:
  Fix the vertical positioning of the text in collapsed notifications.
  Increase the notification height to 88dp
2021-02-27 03:08:17 +00:00
Soonil Nagarkar
be0734de31 Merge "Assorted minor cleanups" into sc-dev 2021-02-27 01:14:41 +00:00
Hui Wang
043304fc1d Merge "Support telephoy command to set test mode for RCS single registration" into sc-dev 2021-02-27 00:04:51 +00:00
Hui Wang
4c207117c0 Merge "Notify rcs config as needed when RCS service ready" into sc-dev 2021-02-27 00:04:51 +00:00
Nate Myren
066f1bce6e Merge "Show usage by default speech recognizer" into sc-dev 2021-02-26 23:51:30 +00:00
Yuncheol Heo
5562d804b6 Fix NPE in DisplayPowerController.
Bug: 181365021
Test: atest com.android.car.CarUxRestrictionsManagerServiceTest
Change-Id: Ic704edf0f43cf05b0fc73124497086b2594eaabd
2021-02-26 15:40:18 -08:00
Dmitri Plotnikov
3539f8eea2 Remove support for OLD_HISTORY
The OLD_HISTORY constants has been set to false for almost
ten years. Need to simplify history support in preparation for
including history in BatteryUsageStats.

Bug: 180765532
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryTest
Change-Id: I8b7f55eb6e9e1c896dc046d2e6dafba885bf8970
2021-02-26 23:14:04 +00:00
Shuo Qian
8b8f2625db Merge changes from topic "cp-rvc-aosp" into sc-dev
* changes:
  [automerged blank] Add Emergency callback mode shell command 2p: b201f9b1e6
  Add Emergency callback mode shell command
2021-02-26 22:56:18 +00:00
TreeHugger Robot
3512bdfde4 Merge "Add @IntRange() to audio encoding capability apis" into sc-dev 2021-02-26 22:39:53 +00:00
Paul Hobbs
8aee32530e Merge "Revert "setTemporaryAppWhitelistDuration(long duration) is depre..."" into sc-dev 2021-02-26 22:34:14 +00:00
Soonil Nagarkar
fd1b2d1bf0 Merge "Use listener for AntennaInfo" into sc-dev 2021-02-26 22:19:40 +00:00
Hai Zhang
9793a67875 Merge "Fix permission state missing when backup is restored." into sc-dev 2021-02-26 21:59:42 +00:00
Kevin Chyn
e9e5607415 Merge changes Ib61c9a4f,I308cd691 into sc-dev
* changes:
  Inflate a new UdfpsView for each new operation
  Add defaults to fix fake UDFPS
2021-02-26 21:35:12 +00:00
Paul Hobbs
13bcd99f34 Revert "setTemporaryAppWhitelistDuration(long duration) is depre..."
Revert "Specify temp-allowlist reasonCode."

Revert submission 13705302-setTemporaryAppWhitelistDuration(long duration)

Reason for revert: This CL breaks com.android.server.pm.test.verify.domain.DomainVerificationProxyTest. It was submitted via a bad TreeHugger bypass.

Reverted Changes:
I705b97e33:setTemporaryAppWhitelistDuration(long duration) is...
Ide879bafb:Specify temp-allowlist reasonCode.

Change-Id: I13f90beaaff484e4abdcc61bb026685bd0cb16f2
2021-02-26 21:18:50 +00:00
Jeff DeCew
726294ff05 Fixes Copyright date & incorrect a11y announcement
Fixes: 180118819
Test: Manual
Change-Id: I8a89ece2db075ceb33861109d1634442a670233e
2021-02-26 15:49:16 -05:00
Fabian Kozynski
8760b38f80 Merge "Dismantle remove labels prototype" into sc-dev 2021-02-26 20:47:59 +00:00
Antonio Kantek
22d3fb687f Merge "Hiding back AudioAttributes#usageToString(int)" into sc-dev 2021-02-26 20:43:52 +00:00
Winson Chung
243f0d1f48 Merge "Compute nearest frames after layout" into sc-dev 2021-02-26 19:59:33 +00:00
Ying Xu
288c04525d Merge "Use the NetworkCallback to determine the default network" into sc-dev 2021-02-26 19:55:13 +00:00
Ying Xu
b370a661b7 Merge "Define wrapper classes for WiFi and Mobile indicators" into sc-dev 2021-02-26 19:54:52 +00:00
Yohei Yukawa
7988287f0a Make "adb shell cmd input_method tracing" official
This is a follow up CL to our previous CL [1], which introduced a new
shell command to start/stop IME tracing.

Perhaps this might be too opinionated, but "adb shell ime" had been
used as a convenient wrapper only for enabling/selecting IMEs and not
for doing anything beyond that.

Admittedly

  adb shell ime tracing start

is short and convenient, but keep in mind that for winscope we already
type the following command.

  adb shell cmd window tracing start

For better consistency, it'd make mose sense for us to use the
following command instead.

  adb shell cmd input_method tracing start

Note that this CL does not remove "adb shell ime tracing start" so as
not to break internal tooling, but at some point we should migrate all
the tools to use the new command.

 [1]: Ia89f11d5ef8a220ea7746191b18769cea5a8359d
      cf9e5123ce

Fix: 180765389
Test: "adb shell cmd input_method tracing start" works.
Test: "adb shell ime tracing start" still works.
Test: "adb shell ime list" still works.
Change-Id: Ic53fd7c8baa3340250cf5e03bd225cce219eae61
2021-02-26 11:51:00 -08:00
Salud Lemus
c8fa14edae Merge "Update keyguard screen text for a financed device" into sc-dev 2021-02-26 19:44:41 +00:00
Chris Li
cc8370b542 Merge "Attach immersive confirmation window to the immersive activity root" into sc-dev 2021-02-26 19:30:21 +00:00
Pinyao Ting
f11257a6db Merge "Shortcut integration with AppSearch (Part 1)" into sc-dev 2021-02-26 19:25:30 +00:00
Nate Myren
4ee433cc90 Show usage by default speech recognizer
Test: manual
Fixes: 181067845
Change-Id: I9be50bf4bbafcedbc1c52adc0780b9821c865c8d
2021-02-26 11:22:58 -08:00
Jeff DeCew
19864ec962 Fix the vertical positioning of the text in collapsed notifications.
Test: manual / visual
Bug: 181048615
Change-Id: I57fb542a776b254a6537dbed608259e69def411f
2021-02-26 14:19:00 -05:00
Jeff DeCew
072848e163 Increase the notification height to 88dp
Test: manual
Bug: 181048615
Change-Id: If2a13daf2b4b583102ec0a1d1f3df8b9f17b41dd
2021-02-26 14:18:59 -05:00
Jeff DeCew
8ceb0f52d1 Merge "Hide the snooze button from various notifications." into sc-dev 2021-02-26 19:17:38 +00:00
Meng Wang
b06c496db7 Merge "Rename KEY_AES_URL_STRING" into sc-dev 2021-02-26 19:06:21 +00:00
TreeHugger Robot
ce601122fa Merge "Block instant apps before domain verification filtering" into sc-dev 2021-02-26 19:01:37 +00:00
Daniel Bright
e32074d80f Merge "Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1" into sc-dev 2021-02-26 19:00:37 +00:00
Hui Yu
2683542500 Merge "setTemporaryAppWhitelistDuration(long duration) is deprecated." into sc-dev 2021-02-26 18:55:37 +00:00
Brad Ebinger
c9fa77a9a6 Merge "Add a new Config to map PIDF service-description to IMS Feature Tags" into sc-dev 2021-02-26 18:52:55 +00:00
Fabian Kozynski
e377f441e0 Dismantle remove labels prototype
Test: manual
Bug: 171319433
Change-Id: I1ea97cec5c0d9b559213ca2adb9ddf7af60229a6
2021-02-26 13:50:43 -05:00