Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
568,155 Commits 3 Branches 0 Tags
c4db697186c4e56c24bec2cee7b16de27facedd8
Commit Graph

568155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c4db697186 Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" am: b7bccf0c76 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709778

Change-Id: Ibede53ed8bdfdc64934abc4367ce81704e17f2da
 2021-05-18 23:02:26 +00:00
Treehugger Robot
2124039b90 Merge "Reset target sdk version of ParseTypeImpl" am: 9635abafa0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710293

Change-Id: I03c1e210745a5a6f5e9d51dd7117a6c33b736118
 2021-05-18 22:50:44 +00:00
Patrick Baumann
4c56bac295 Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089

Change-Id: I9a93b5518d438d87b3f7da1871421f6cf3719590
 2021-05-18 22:45:49 +00:00
Kweku Adams
06dacb662c Update OWNERS file. am: afbce365ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1707291

Change-Id: I2528e04c49ea374cdbd6e4cced7dd639975392c9
 2021-05-18 22:42:16 +00:00
Treehugger Robot
b7bccf0c76 Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" 2021-05-18 20:54:38 +00:00
Treehugger Robot
9635abafa0 Merge "Reset target sdk version of ParseTypeImpl" 2021-05-18 19:56:58 +00:00
Patrick Baumann
1ef34e9022 Merge changes I04dfc5c2,Idc7e1f3c 
* changes:
  Updates OWNERS files
  Update OWNERS file.
 2021-05-18 19:03:06 +00:00
Chris Weir
c589d4e2a3 Merge "Print human-readable OEM managed states" am: c4099ac074 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636561

Change-Id: I38380b1f6a80fdfbbcc21124470929530131fcdd
 2021-05-18 17:03:21 +00:00
Chris Weir
c4099ac074 Merge "Print human-readable OEM managed states" 2021-05-18 16:29:26 +00:00
Les Lee
812956f97d Merge "Support to query TYPE_WIFI usage with subscriberId" am: ced78f535c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057

Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
 2021-05-18 13:35:08 +00:00
Les Lee
94fa18312d Merge "Add metered filter for API: buildTemplateCarrier" am: 287dcfbc80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687

Change-Id: Iac42f02079de5c0507209741e648b13da667fb94
 2021-05-18 13:26:24 +00:00
Les Lee
ced78f535c Merge "Support to query TYPE_WIFI usage with subscriberId" 2021-05-18 13:02:07 +00:00
Les Lee
287dcfbc80 Merge "Add metered filter for API: buildTemplateCarrier" 2021-05-18 13:01:38 +00:00
Siim Sammul
464a14b593 Merge "Add plumbing to collect Binder stats for battery attribution" am: e6a97f86a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709588

Change-Id: Iaa1fbb53a49ed0d0e3847d36adeb50b939191b27
 2021-05-18 09:40:44 +00:00
Treehugger Robot
1918c8edda Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: 5bae6daf9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705390

Change-Id: I0d8dd61da97e675ba70fd7dd5f1e889d8a2e54f7
 2021-05-18 09:36:15 +00:00
Siim Sammul
e6a97f86a7 Merge "Add plumbing to collect Binder stats for battery attribution" 2021-05-18 09:23:48 +00:00
liulvping
2cd9d26116 Reset target sdk version of ParseTypeImpl 
In device booting, PackageParser2 uses a thread
local ParseTypeImpl obj as shared result and reset
it before parsing everty time. But it doesn't reset
the target sdk version, which could make deferError
returned unexpected error, cause apk scaned failed
and deleted by the system.

Test: atest com.android.server.pm.parsing

Change-Id: Ie6fbc4b79e94943c9282206b1ef6d20b4129fa0b
Signed-off-by: liulvping <liulvping@xiaomi.com>
 2021-05-18 17:10:54 +08:00
Treehugger Robot
5bae6daf9b Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" 2021-05-18 08:35:06 +00:00
Treehugger Robot
e7c63d9ec9 Merge "Kill logcat with SEGV so we get a tombstone on timeout." am: 2a088541ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696086

Change-Id: I6f2c4d4fb099abfd1b042559964cb07a84c0ca21
 2021-05-18 03:47:05 +00:00
Treehugger Robot
2a088541ac Merge "Kill logcat with SEGV so we get a tombstone on timeout." 2021-05-18 03:12:50 +00:00
Chiachang Wang
8b230f75d6 Merge "Dump only NORMAL priority information if no priority assigned" am: f93d99deae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708333

Change-Id: I7c3bd130b67c40bb8be23073dbfa4aaf85624016
 2021-05-18 02:37:13 +00:00
Chiachang Wang
f93d99deae Merge "Dump only NORMAL priority information if no priority assigned" 2021-05-18 02:12:28 +00:00
Christian Wailes
1958d5853c Merge "Make BackgroundDexOpt aware of thermal state" am: 6c914b4bc6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706449

Change-Id: I93441b97c6e3d4a397898d349cc5bf6417f24a3d
 2021-05-17 19:49:09 +00:00
Aurimas Liutikas
b715c4d730 Revert^2 "Fix incompatibilities with Kotlin 1.5.0" 
c5b4071877

Change-Id: I1fc09f028411cce8bdaa9eec68eaf88116f2143f
 2021-05-17 17:41:41 +00:00
Christian Wailes
6c914b4bc6 Merge "Make BackgroundDexOpt aware of thermal state" 2021-05-17 16:15:40 +00:00
Dmitri Plotnikov
474354593d Add plumbing to collect Binder stats for battery attribution 
Cherry picked from internal master: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/9966816

Bug: 158232997
Test: atest FrameworksCoreTests:com.android.internal.os.BinderCallsStatsTest

Change-Id: Icbccd26e20bc4ead13ffeac76b851af39269ca89
Merged-In: Icbccd26e20bc4ead13ffeac76b851af39269ca89
 2021-05-17 15:42:17 +00:00
Nikita Iashchenko
e995e4b476 Merge "Refactor StructCapUser{Header,Data} and StructLinger for API review" am: c1edd696c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689828

Change-Id: I014f6f840cf781c342f625d7859a9363381d9301
 2021-05-17 11:04:01 +00:00
Nikita Iashchenko
c1edd696c7 Merge "Refactor StructCapUser{Header,Data} and StructLinger for API review" 2021-05-17 10:46:32 +00:00
Siim Sammul
df590e2e6b Merge "Change BinderLatencyBuckets to use int[] instead of ArrayList to improve performance." am: 0dadb6664a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706688

Change-Id: I9115680b2daff9f023532be74b8198ad6b858ea1
 2021-05-17 10:16:10 +00:00
Siim Sammul
0dadb6664a Merge "Change BinderLatencyBuckets to use int[] instead of ArrayList to improve performance." 2021-05-17 09:43:41 +00:00
Chiachang Wang
8932c3b27d Dump only NORMAL priority information if no priority assigned 
The legacy design of "dumpsys connectivity" will only dump
information with NORMAL priority. It was updated to provide
both NORMAL and HIGH priority information in order to support
dump in bugreport. However, it will also affect the result
using dumpsys connectivity.

Update design to dump NORMAL priority only to align with legacy
design.

Bug: 188387185
Test: adb shell dumpsys connectivity
Test: adb bugreport and check the result in bugreport
Change-Id: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
 2021-05-17 17:31:07 +08:00
Paul Hu
eaaa0cbce1 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: a199e8bf27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573

Change-Id: If352718bf7de1c6446f291710c2b114ffd57abc6
 2021-05-17 07:31:32 +00:00
junyulai
1b70bd185d [VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present 
Test: atest NetworkRequestTest#testBypassingVcn
Fix: 176939355
Change-Id: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
 2021-05-17 07:04:13 +00:00
Paul Hu
a199e8bf27 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" 2021-05-17 06:45:52 +00:00
Paul Hu
9eec752260 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: 59dc4f0ac2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572

Change-Id: I5515f041b783e36ca439e2b7b1d77e93ee329be0
 2021-05-17 03:28:16 +00:00
Paul Hu
59dc4f0ac2 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" 2021-05-17 03:04:59 +00:00
Chiachang Wang
1fb7474033 Merge "Replace clearAll with withoutDefaultCapabilities" am: 86a1c27f57 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330

Change-Id: Ibb29c90f818ca6f447d91f0eda0abe0ef82363dd
 2021-05-17 02:29:35 +00:00
Chiachang Wang
86a1c27f57 Merge "Replace clearAll with withoutDefaultCapabilities" 2021-05-17 01:56:52 +00:00
paulhu
fac3fc8ff5 Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer 
PermissionMonitor register APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting observer to listen setting changed callback. Then update
or revoke permission for those apps.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520
 2021-05-16 15:52:36 +00:00
paulhu
08295d2feb Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor 
Let PermissionMonitor read APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting and grant netd system permission to uids whose package
name is listed in setting.

Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12
 2021-05-16 23:48:55 +08:00
lesl
ab4abcf073 Support to query TYPE_WIFI usage with subscriberId 
Previous the API ignores subscriberId when network type is WIFI.
Allow caller to call querySummaryXXXX with TYPE: WIFI
+ subscriberId: IMSI to get carrier merged wifi usage which matches the wifi
network with the given IMSI.

Bug: 176396812
Test: atest -c NetworkStatsServiceTest
Change-Id: Ia033521a24e2bb56182d74a41bb2b39710571782
 2021-05-16 22:18:32 +08:00
Junyu Lai
ed64c29783 Merge changes I3ba50cbd,I970ee365 am: 37f2408143 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: I2cf4ea0abb1ff7bc74302cce16cbe8041b08d321
 2021-05-15 16:53:30 +00:00
Junyu Lai
37f2408143 Merge changes I3ba50cbd,I970ee365 
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus
 2021-05-15 16:21:38 +00:00
Benedict Wong
a6006f1d44 Merge "Remove underlying network caps" am: 886e94b0a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709008

Change-Id: I327333d7897c088ef79b41f61dfa8929c2e45f1c
 2021-05-14 22:51:39 +00:00
Nathan Harold
b9ec9c28ef Merge "Update VCN Owners Post-Initial-Development" am: 4b8d448b3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709010

Change-Id: I9d0d11bd364a759d2f5ccb3d4a56f2a4270d9ac6
 2021-05-14 22:48:08 +00:00
Chris Wailes
d63d206f97 Make BackgroundDexOpt aware of thermal state 
This change makes the BackgroundDexOpt service consider the thermal
state of the device before running.  If the device is in a moderate thermal
state or worse background dexopt will not run.

Bug: 165935246
Test: Treehugger && atest BackgroundDexOptServiceIntegrationTests
Change-Id: Ie5ccbab7aa6d414241780136407f397d326340bf
 2021-05-14 15:42:29 -07:00
Benedict Wong
886e94b0a3 Merge "Remove underlying network caps" 2021-05-14 22:40:54 +00:00
Benedict Wong
b2632543c0 Remove underlying network caps 
Bug: 182219992
Test: atest FrameworksVcnTests
Change-Id: Ic2fec8a87fd19a1780333c61759c4092598d349e
 2021-05-14 15:28:34 -07:00
Nathan Harold
4b8d448b3b Merge "Update VCN Owners Post-Initial-Development" 2021-05-14 22:27:00 +00:00
Nathan Harold
e0f865d554 Update VCN Owners Post-Initial-Development 
Owners files update for VCN now that primary development
is complete and the codebase is stable.

Bug: 8675309
Test: compilation
Change-Id: Ie686729b33f0a7e1c3414374ce4bf3d7ef514a22
 2021-05-14 15:05:26 -07:00