Commit Graph

8659 Commits

Author SHA1 Message Date
Sudheer Shanka
58fb9a2c1f Merge "Update usage of allowlist/denylist in some method names/comments." am: 771aa062b9 am: b4c68c4216 am: 0b39593d11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40b28e3be169fbc59f8b889871ed938b45de2fab
2020-12-24 09:50:20 +00:00
Sudheer Shanka
0b39593d11 Merge "Update usage of allowlist/denylist in some method names/comments." am: 771aa062b9 am: b4c68c4216
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e8af4a71f23438e830b1a44834719b7c488d67
2020-12-24 09:36:33 +00:00
Sudheer Shanka
771aa062b9 Merge "Update usage of allowlist/denylist in some method names/comments." 2020-12-24 08:16:51 +00:00
Sudheer Shanka
ab00eadcc0 Update usage of allowlist/denylist in some method names/comments.
In a previous change (https://r.android.com/1394342), we did a mass update of whitelist->allowlist
and blacklist->denylist in network policy related code. Updating
some usages of those (like allowlisted to allowed) to make them
sound natural.

Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Test: atest services/tests/servicestests/src/com/android/server/NetworkManagementInternalTest.java
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I6d34b0bd3cdb64d5872874fd9378bfc962a24f8d
2020-12-24 04:03:33 +00:00
Chiachang Wang
b06e8235db Merge "[IT02] Expose system api to report radio power state" am: b1de9a09bd am: 15cc8f0f71 am: df9fc2853d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04944dae4059c790f3f1015068401057d0d81b79
2020-12-23 07:30:43 +00:00
Chiachang Wang
df9fc2853d Merge "[IT02] Expose system api to report radio power state" am: b1de9a09bd am: 15cc8f0f71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I379193edf34a6371e9e2febe372fa238420a0caa
2020-12-23 06:48:53 +00:00
Chiachang Wang
b1de9a09bd Merge "[IT02] Expose system api to report radio power state" 2020-12-23 05:19:51 +00:00
Tianjie Xu
c39f269af7 Merge "Deprecate the old rebootAndApply API" am: cabef01cb3 am: 7a81aade1d am: 2aa7d539d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533087

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f4747808d5087b693d7ba598329f9845bf9769e
2020-12-22 07:03:16 +00:00
Todd Kennedy
18a66adaf8 Merge "Add OWNERS for incremental" am: b8ff8f238e am: 25d1667e00 am: e01d70114c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I552a10ec84b653c089a6e5bad017e89f43d54fe9
2020-12-22 06:50:51 +00:00
Chiachang Wang
3f01a7a8c1 [IT02] Expose system api to report radio power state
In order to support ConnectivityService mainline, the dependency
with NMS should be removed. The idle timer control API should be
replaced with calling INetd interface instead of using NMS hidden
API.

The state reporting will be triggered from updating idle timer
and netd unsolicited interface activity changed events.
BatteryStatsService should be able to get the netd event by
registering the listener directly. This commit exposes two system
APIs to report the radio power state for wifi and mobile for
supporting update idle timer from CS directly to INetd.

Bug: 170598012
Test: make update-api ; m
Change-Id: I286d6aa237ecb2653e1464e26a3581b8eeeb9e63
2020-12-22 08:39:22 +08:00
Tianjie Xu
2aa7d539d3 Merge "Deprecate the old rebootAndApply API" am: cabef01cb3 am: 7a81aade1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533087

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0418e182285ee86aefcafb8edba7002229dbc5e
2020-12-21 19:20:28 +00:00
Tianjie Xu
cabef01cb3 Merge "Deprecate the old rebootAndApply API" 2020-12-21 18:53:20 +00:00
Suren Baghdasaryan
1ec253eb5d Merge "Add total GPU usage report into dumpsys meminfo output" 2020-12-21 16:23:37 +00:00
TreeHugger Robot
026102b5c8 Merge "Add SystemBatteryConsumer for the Bluetooth drain type" 2020-12-19 07:36:44 +00:00
Dmitri Plotnikov
8677b4eb5b Add SystemBatteryConsumer for the Bluetooth drain type
Bug: 175644968
Test: mp :BatteryStatsViewer && adb shell am start -n com.android.frameworks.core.batterystatsviewer/.BatteryStatsViewerActivity

Change-Id: I2adde65a63faf18f0120f281ab1fcd5373f25091
2020-12-18 18:10:00 -08:00
Suren Baghdasaryan
e4e515e2b4 Add total GPU usage report into dumpsys meminfo output
With latest kernel changes, total GPU memory usage is reported and can
be obtained via a BPF program. Create JNI interface to query it and
report inside dumpsys meminfo output.

Bug: 171261987
Test: dumpsys meminfo
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I949a13836d5b5bc87fc43f60871b4fbf2add6480
2020-12-18 01:25:47 +00:00
Todd Kennedy
e01d70114c Merge "Add OWNERS for incremental" am: b8ff8f238e am: 25d1667e00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5df3b15db2ef7cc56583d00a7d6f2e588b87c8a3
2020-12-17 23:17:45 +00:00
Roshan Pius
8a6a757852 Merge "BatterStatsManager: Remove "flag" for wifi IntDef's" 2020-12-17 21:38:07 +00:00
Tianjie
4343e3ebca Deprecate the old rebootAndApply API
This API isn't aware of slot switch, and shouldn't be used by
phonesky. So we prefer to deprecate it in case new callers use
it accidentally. Also don't allow callers with REBOOT permission
to call it.

Bug: 170664917
Test: build
Change-Id: I540b87fad461cb2c900f3e9d177bb5147abc1a22
2020-12-17 13:05:36 -08:00
Todd Kennedy
a2991e1001 Add OWNERS for incremental
Change-Id: Id0acdfff82c625fe05c6966956d1478ce8355a71
2020-12-17 17:20:10 +00:00
Manish Singh
7fe47a64d2 Fix screenshot failure with transcoding
We currently attempt to convert transcode fds to original fds inside
the platform media players. This causes screenshot
failures in ExifInterface. To mitigate, we only match published videos
in DCIM/Camera.

Bug: 173543930
Bug: 175831095
Test: atest FileUtilsTest#testConvertToModernFd
Test: Manual, tested by both taking a screenshot and video transcoding.

Change-Id: I4abba3d9d36e83c5a019b32793bd38fee81d5f75
2020-12-17 16:51:13 +00:00
Treehugger Robot
ccd634ec0c Merge "Make a copy of libcore.util.ArraysUtils in framework" am: f35963cb77 am: acd5ae1807
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0232dc3e89ca638cf5097888946f7f70b3f116d1
2020-12-17 11:10:44 +00:00
Treehugger Robot
f35963cb77 Merge "Make a copy of libcore.util.ArraysUtils in framework" 2020-12-17 10:10:52 +00:00
Tianjie Xu
134810ccb0 Merge "Update the system API to support multi client RoR" am: 0b9d85dab5 am: 4bf68fc222 am: 90c5c0509d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia460d58375070fe8c6921e6147e8c2039006e30b
2020-12-17 05:14:04 +00:00
Tianjie Xu
4a46ad51da Merge "Add multi client ror support" am: fa7173b8ac am: 0572043849 am: 04218179bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483936

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4853e4516a244cf79c392065c28bcecd9ce17f27
2020-12-17 05:13:18 +00:00
TreeHugger Robot
957b14994d Merge "Add "modeled" power components" 2020-12-17 04:03:13 +00:00
Victor Chang
63c5fe5d33 Merge "Make a copy of libcore.util.ArraysUtils in framework" 2020-12-17 02:25:00 +00:00
Tianjie Xu
90c5c0509d Merge "Update the system API to support multi client RoR" am: 0b9d85dab5 am: 4bf68fc222
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8a094bf80c3fb0990d7011424f00508dcbcc356
2020-12-17 00:48:35 +00:00
Tianjie Xu
04218179bc Merge "Add multi client ror support" am: fa7173b8ac am: 0572043849
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483936

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9099a372d0612e96c409029ca79fc7ecfbf06648
2020-12-17 00:47:48 +00:00
Victor Chang
37c6b6deeb Make a copy of libcore.util.ArraysUtils in framework
It helps remove it from the @CorePlatformApi

Bug: 154796679
Test: ArrayUtilsTest
Merged-In: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
Change-Id: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
2020-12-17 00:07:23 +00:00
Victor Chang
198ced861a Make a copy of libcore.util.ArraysUtils in framework
It helps remove it from the @CorePlatformApi

Bug: 154796679
Test: ArrayUtilsTest
Change-Id: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
2020-12-16 23:50:30 +00:00
Tianjie
41afcdc45b Update the system API to support multi client RoR
Detailed design in http://go/multi-client-ror. We will reuse most of
the old APIs, and there are a few notable changes
1. Infer the package name from the existing context
2. Remove the unused update token
3. Add the REBOOT permission, so phonesky can hold it.
4. Add a new API for rebootAndApply, which takes a slotSwitch parameter

Bug: 170664917
Test: build

Change-Id: Icb012138bd1789ce03564aa255e5bd4e84374130
2020-12-16 23:40:28 +00:00
Tianjie Xu
fa7173b8ac Merge "Add multi client ror support" 2020-12-16 23:39:31 +00:00
Dmitri Plotnikov
cd6147bea9 Add "modeled" power components
Modeled power components are computed without regard
for power measured with ODPM/rails.

The purpose of this is mostly to support testing
of power models themselves.

Bug: 175644968
Test: mp :BatteryStatsViewer && adb shell am start -n com.android.frameworks.core.batterystatsviewer/.BatteryStatsViewerActivity

Change-Id: Icca6fe6954776baed48b593017abd8c9bab4dfb7
2020-12-16 13:07:04 -08:00
TreeHugger Robot
8068b16f2f Merge "Move NUM_GPS_SIGNAL_QUALITY_LEVELS to GnssSignalQuality" 2020-12-16 18:58:25 +00:00
Biswarup Pal
b23206602a Add freeCache API to ExternalStorageService
Call ExternalStorageService#freeCache from
PackageManagerService#freestorage via StorageManagerInternal
to free any cache held by ExternalStorageService under low storage
conditions.

Test: m
Bug: 170481432
Change-Id: Iaee2262705f4c99fb9e46875e321dcbbae841824
2020-12-16 09:11:15 +00:00
Tianjie
acea5f3b54 Add multi client ror support
Detailed design in http://go/multi-client-ror. This cl adds internal
states in RecoverySystemService to keep track of multiple RoR
callers. The general principles works as:
1. Each client should call prepare before reboot
2. One client cannot clear the preparation of another client
3. If multiple clients have prepared the update, the subsequent
   reboot will be first come, first served.

Bug: 170664917
Test: atest FrameworksServicesTests:RecoverySystemServiceTest

Change-Id: Ic8c7438f8a0300870ceed8857c46425fc0d006b9
2020-12-15 21:12:12 -08:00
Soonil Nagarkar
ff097cef17 Move NUM_GPS_SIGNAL_QUALITY_LEVELS to GnssSignalQuality
This allows us to move GnssMetrics out of the client in a follow up CL.

Test: compiles
Change-Id: Idce044199f2ce223f893bfaecf43e5043a83bb94
2020-12-15 21:29:08 +00:00
Peiyong Lin
28613f9d31 Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev am: 23ace73ac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13229183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20f201739a456f9580328670189e506e284feb2e
2020-12-15 19:10:01 +00:00
Peiyong Lin
23ace73ac4 Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev 2020-12-15 19:02:54 +00:00
TreeHugger Robot
946b5ee77a Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev am: 9622b6d7d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id450db7d6874e2e1f4832b8dc0c40f972d62bf18
2020-12-15 18:48:15 +00:00
Peiyong Lin
3cb225dc74 [GraphicsEnvironment] Avoid null access.
Currently when debug layer apk is not installed, GraphicsEnvironment
logs the message and proceeds, which results in null pointer access
crash when later trying to access primaryAbi. Avoid null access by an
early return statement.

Bug: N/A
Test: specify not installed debug layer apk and no crash
Change-Id: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
Merged-In: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
(cherry picked from commit c5c17e66ba)
2020-12-15 10:22:53 -08:00
Peiyong Lin
d22eebefdb [GraphicsEnvironment] Avoid null access.
Currently when debug layer apk is not installed, GraphicsEnvironment
logs the message and proceeds, which results in null pointer access
crash when later trying to access primaryAbi. Avoid null access by an
early return statement.

Bug: b/175699044
Test: specify not installed debug layer apk and no crash
Change-Id: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
Merged-In: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
(cherry picked from commit c5c17e66ba)
2020-12-15 17:54:45 +00:00
Zimuzo Ezeozue
6b792986d6 Merge "Add StorageVolume#getStorageUuid" 2020-12-15 16:11:57 +00:00
Zim
67eb83ba0b Add StorageVolume#getStorageUuid
Unlike getUuid that returns fsUuid, this returns the 'converted'
fsUuid. This means that for the default internal storage:
- fsUuid = null
- uuid = UUID_DEFAUlT

Test: atest StorageManagerTest#testGetPrimaryVolume
Bug: 170481432
Change-Id: I4c590e5536326e5c2a0b62520f9853de680027ae
2020-12-15 11:42:30 +00:00
Jeff Sharkey
a004868b99 Merge "Update the owner of recovery systems" am: 612b7e7d1d am: 483f980afe am: a2ae9eb6e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I891d5d247245f1dda6241d0fc9a660acb8798be0
2020-12-15 01:08:55 +00:00
Jeff Sharkey
73ce95bc8e Merge "Add OTA team as the owner of recovery systems" am: 8ef2e0426a am: 305b2ce554 am: 44a90dab48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528858

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22cc552df4dc5fec6c1a35cac78bd4e5af473d59
2020-12-15 01:08:27 +00:00
Jeff Sharkey
a2ae9eb6e1 Merge "Update the owner of recovery systems" am: 612b7e7d1d am: 483f980afe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idffa8d9f4d9473b205244a92e222cee5e2d6f99b
2020-12-15 00:45:09 +00:00
Jeff Sharkey
44a90dab48 Merge "Add OTA team as the owner of recovery systems" am: 8ef2e0426a am: 305b2ce554
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528858

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47e7c56345f66dd137ba664eed24d01ba7a2cfab
2020-12-15 00:44:58 +00:00
Tianjie
a809a05b92 Update the owner of recovery systems
Use the same owner file from the services.

Test: build
Change-Id: I976c90c2fd16efe20ca3b944c6e45c30550e3226
2020-12-14 16:24:12 -08:00