Commit Graph

15912 Commits

Author SHA1 Message Date
Oli Lan
4ecda9575d Merge "Set source package when copying from share sheet." into sc-dev 2021-03-11 10:06:42 +00:00
Victor Hsieh
f4305279e5 Merge "Move VerityUtils from services.jar to core.jar" into sc-dev 2021-03-10 23:10:25 +00:00
Jeff DeCew
364576c7e0 Merge "Flow text around the large icon." into sc-dev 2021-03-10 22:19:22 +00:00
Taran Singh
dd7874a401 Merge "Avoid IME restart for configChanges" into sc-dev 2021-03-10 19:15:23 +00:00
Beth Thibodeau
5b1beb3963 Merge "Remove screenrecord flag code from global actions" into sc-dev 2021-03-10 17:10:00 +00:00
Jeff DeCew
cdf6b6b4c9 Flow text around the large icon.
This is only necessary when a notification is posted without a title.

Fixes: 177976174
Test: Manual inspection of various staes.
Change-Id: I15fdc31e1557b7e5d6fb99e410f4bf37d6734ac4
2021-03-10 10:34:58 -05:00
TreeHugger Robot
8b7a902791 Merge "Remove phone number from the "new" CallStateListener." into sc-dev 2021-03-10 13:40:13 +00:00
Taran Singh
9a2eed9f49 Avoid IME restart for configChanges
Handle onConfigurationChanged() in order to prevent restarting
InputMethodService everytime. We introduce a new API attribute
"configChanges" in InputMethod(attrs.xml) which when declared
by IME, will be responsible for handling mentioned
configuration changes.

This CL re-introduces [1] with fix: Use new Configuration instance for
IMS#mLastKnownConfig

[1] Iff88b768c6b06cf5cf1fe9e97ee97f8f78e6f0bd

Bug: 167948419
Test: atest InputMethodServiceTest
    Manually:
      1. Patch Ie91e7a8e06b80864ef9409031e8543858552d70d to use dual
         display area.
      2. Open applications with editors on both display areas.
      3. Attach a debug point for IMS#onConfigurationChanged().
      4. Make sure IMS#resetStateForNewConfiguration() is not called
         when IME moves between these two identical DisplayAreas

Change-Id: Ib94fddadb0dae648cf73a4c1642e51edebd19f50
2021-03-10 08:22:42 +00:00
Wu Ahan
a2397bacb2 Merge "Always remove the observers in cancel to avoid object leakage" into sc-dev 2021-03-10 05:50:03 +00:00
Jing Ji
2b2e73d1d6 Merge "Clone the CallStat objects/lists before dispatching it to the listener" into sc-dev 2021-03-10 02:16:46 +00:00
Jeff Sharkey
e394c59a75 Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b686a am: ee20cc3ca1 am: d2cd30f2cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01a6b4f516ee1e74707babc10e5846d5cbfb61fe
2021-03-10 00:53:43 +00:00
Jeff Sharkey
d2cd30f2cc Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b686a am: ee20cc3ca1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b80a78b7e017e7c8bce69d856b321de6dc9357d
2021-03-10 00:05:37 +00:00
Jeff Sharkey
3f0f0b686a Merge "Wait for installd to start to perform dexopt operation" 2021-03-09 23:01:37 +00:00
Dmitri Plotnikov
f0a755448b Merge "Prevent crash when power profile has incorrect freq counts" into sc-dev 2021-03-09 18:44:29 +00:00
Ahan Wu
032d7a0b53 Always remove the observers in cancel to avoid object leakage
We didn't remove the observers if the cancel invocation came from end(),
this caused leakage of FrameTracker, so we always remove the observers
no matter where the cancel invocation comes from.

Bug: 181683700
Test: atest FrameworksCoreTests:InteractionJankMonitorTest
FrameworksCoreTests: FrameTrackerTest
Change-Id: Ia03ebc3b579257dd387eaa1be65b9d22e7b7bf91
2021-03-09 18:15:43 +00:00
Oli Lan
c312e2fbea Set source package when copying from share sheet.
This uses a new system API to attribute the source package when copying
to clipboard from the share sheet.

This is needed because in S users will see a toast message saying
"<app> pasted from <source>" when an app accesses clipboard. Without
this change, any copy originating from the share sheet results in
"<app> pasted from Android System" rather than the app that is the
actual source of the data.

Bug: 180577866
Test: Manual, share via share sheet and paste in another app;
observe "<app> pasted from <source app>"

Change-Id: Id1c0afcf6e775868febc7c8ab5b44dbacccacfa2
2021-03-09 13:45:31 +00:00
Treehugger Robot
d4e1a70921 Merge "Add final qualifier in LocationPermissionChecker" am: b002b20492 am: 50843debeb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618842

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60de5561418ac24a1210dec2d4ecaf16d1779518
2021-03-09 08:26:17 +00:00
Treehugger Robot
b002b20492 Merge "Add final qualifier in LocationPermissionChecker" 2021-03-09 07:58:14 +00:00
Dmitri Plotnikov
2d0ff3d3bd Prevent crash when power profile has incorrect freq counts
Bug: 179750543
Test: build and launch Settings
Change-Id: I9ede5caf0001deff0067eabd9520af9d315ac95f
2021-03-08 20:17:48 -08:00
Tyler Gunn
95674c6cd1 Remove phone number from the "new" CallStateListener.
When the legacy PhoneStateListener was migrated to the new
TelephonyCallback class, the onCallStateChanged listener was copied over
as is.  This CL removes the phone number parameter from the new listener.
Under the hood, both the old PhoneStateListener and the new one use the
same IPhoneStateListener.aidl file, so the onCallStateChanged method for
the legacy listener is changed to onLegacyCallStateListener.

Test: See CTS test CL; added a bunch of CTS tests for this.
Fixes: 165831812
Change-Id: Ia67968b5235954b606c6bd2890cc6f46c468e041
2021-03-08 16:02:41 -08: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
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
Jing Ji
9caf734d3a Clone the CallStat objects/lists before dispatching it to the listener
As these objects/lists could be mutated after being dispatched.

Bug: 181193693
Test: atest BatteryStatsBinderCallStatsTest BinderCallsStatsTest
Change-Id: I9de44e734acc7313d03ee616aa5e2f0a01da7cf3
2021-03-08 12:35:20 -08: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
Siarhei Vishniakou
6387cdfb91 Merge "Pass actual present time to ViewRootImpl" into sc-dev 2021-03-08 19:44:12 +00:00
Dmitri Plotnikov
32a183264b Merge "Add batteryTimeRemaining and chargeTimeRemaining to BatteryUsageStats" into sc-dev 2021-03-06 01:56:32 +00:00
Jeff Sharkey
bb107f0d53 Merge "Add per-file OWNERS for ChargeCalculators" am: e191d88136 am: 7526d5687c am: 77229abe61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cfbb9ce3f4257cc676d24bcd0cb71b07279e56b
2021-03-05 22:36:55 +00:00
Jeff Sharkey
77229abe61 Merge "Add per-file OWNERS for ChargeCalculators" am: e191d88136 am: 7526d5687c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8b1efe14f542d922614121c4f9b1ffd4f2a61a6
2021-03-05 22:11:10 +00:00
Dmitri Plotnikov
cf2929ffe9 Add batteryTimeRemaining and chargeTimeRemaining to BatteryUsageStats
Bug: 158137862
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryChargeCalculatorTest
Change-Id: I247a593de242a2864eef16b7c9ea956209f60cbe
2021-03-05 13:57:47 -08:00
Siarhei Vishniakou
f0cf18d3ed Pass actual present time to ViewRootImpl
To measure end-to-end touch latency, we need to report the actual
present time to ViewRootImpl. ViewRootImpl, in turn, will report this
information to InputDispatcher. Finally, InputDispatcher will combine
all known information for a specific input event, and will report this
data to westworld.

In another patch, we will add a new call, 'reportLatencyInfo', to
InputPublisher. This call will allow the app to send this latency data
to InputDispatcher.

Bug: 169866723
Test: printed the input event present times inside ViewRootImpl
Change-Id: Ibd3a2cfeb1a340eb15cd2165071df1f8589634af
2021-03-05 21:42:32 +00:00
Dmitri Plotnikov
266ce1a1f0 Add per-file OWNERS for ChargeCalculators
Test: N/A
Change-Id: I0fd382a25afafcfb9476d35897ec8295f0293053
2021-03-05 10:04:07 -08: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
91568eb50e Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev 2021-03-05 17:10:19 +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
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
SongFerng Wang
03297aacc6 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 am: 6035378f91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia227678f0f38adc05bf6ea39eee0eea8ebfea582
2021-03-05 05:17:43 +00:00
Christian Wailes
02d6322bd2 Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d am: a534c95087 am: 87287a5859
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief019f6e8ee38664c5319e1756ca2c72065cd1af
2021-03-05 05:15:59 +00:00
Christian Wailes
87287a5859 Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d am: a534c95087
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06eb075d11b110ccbbd8dcaecb948e502d69f6bb
2021-03-05 05:10:07 +00:00
Wilson Wu
70c6ea463b Merge "Make IInputMethodPrivilegedOperations to oneway" into sc-dev 2021-03-05 03:54:16 +00:00
SongFerng Wang
b332627a15 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" 2021-03-05 01:59:53 +00:00
TreeHugger Robot
72e83e74a0 Merge "Separate buffer stuffing and jank" into sc-dev 2021-03-05 01:54:13 +00:00
Jorim Jaggi
c373f35107 Separate buffer stuffing and jank
Bug: 161781469
Test: Perfetto trace with CUJ
Change-Id: I8583342a50a1d54b7aede89aa81c98178269b357
2021-03-04 21:48:30 +00:00
Christian Wailes
db6628bb7d Merge changes I04ac8fba,Ia0a8548f
* changes:
  Autoformatter changes.
  Inclusivity cleanup of the Zygote.
2021-03-04 21:09:52 +00:00
Sebastian Achim
7adcb4f170 Wait for installd to start to perform dexopt operation
If there are any system_server jars that need dexopt then
we need to make sure that installd is started.

Issue: 160911601
Test: Manual - see issue
Change-Id: Iefcaf708b695504353f664b91017c9cd3a094f8e
2021-03-04 13:11:02 +01:00
Remi NGUYEN VAN
372fb6d68e Add final qualifier in LocationPermissionChecker
This is a partial cherry-pick of a generic change that added final
qualifiers.

Bug: 181837977
Test: m
Merged-In: I832c9d70c3dfcd8d669cf71939d97837becc973a

Change-Id: Ib6fecc50b17c2f035ff79beaec4a643cf1d2b458
2021-03-04 18:42:52 +09:00
SongFerngWang
e206456a16 Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType
- Add more reasons of allowed network type
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
- Add @systemApi for below
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_POWER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
  - setAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesBitmask API
- Add Public for below
  - CARRIER_NR_AVAILABILITY_NONE
  - CARRIER_NR_AVAILABILITY_NSA
  - CARRIER_NR_AVAILABILITY_SA
  - KEY_CARRIER_NR_AVAILABILITY_INT
- @Deprecated API
  - setPreferredNetworkTypeBitmask
  - getPreferredNetworkTypeBitmask
  - setAllowedNetworkType
  - getAllowedNetworkType
- Add a new way to notify allowedNetworkType at PhoneStateListener
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT

Bug: 161434786
Test: atest TelephonyManagerTest#testSetAllowedNetworkTypesForReason
(PASS)
atest TelephonyManagerTest#\
testSetAllowedNetworkTypesForReason_moreReason
(PASS)
atest PhoneStateListenerTest#\
testOnAllowedNetworkTypesChangedByRegisterPhoneStateListener
(PASS)

Change-Id: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
Merged-In: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
2021-03-04 14:58:54 +08:00
Alex Mang
d77366e4f2 Merge "Propagate ContentCaptureManager allowlist update to activities" into sc-dev 2021-03-04 02:26:25 +00:00
Jeff DeCew
82336d7562 Merge "Change groups to use number in the expander." into sc-dev 2021-03-04 01:12:21 +00:00
Michael Wachenschwanz
95bd56660e Accumulate and attribute measured Cpu energy in BatteryStats
BatteryExternalStatsWorker will now include measured Cpu Cluster energy
data (if available) when triggering a Cpu update in BatteryStatsImpl.
Using the per cluster per uid duration read from the kernel, the
measured energy can be attributed per cluster and then totaled to get
the Cpu energy consumption of a uid since the last update.

Fixes: 180079165
Test: manual ("adb shell dumpsys batterystats --measured-energy" on an
unplugged PowerStatsHal2.0 enabled device)

Change-Id: I0127bf61decdd5a9a5744e3352d5a3ff3a5fa2fe
2021-03-03 16:20:39 -08:00
Chris Wailes
a6f8803c85 Inclusivity cleanup of the Zygote.
Changed "whitelist" to "allowlist" in many Zygote files.

BYPASS_INCLUSIVE_LANGUAGE_REASON="compatability with vendor files"

Test: cts
Change-Id: Ia0a8548f2e254fc36a9dce7e50af8284ed0caa47
2021-03-03 14:23:32 -08:00