Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
564,462 Commits 3 Branches 0 Tags
677fbbbedc83728bba415954650003ed251dc8fc
Commit Graph

14232 Commits

Author SHA1 Message Date
Treehugger Robot
8172883202 Merge "Note network interfaces based on transport" am: 8334a265ad am: cd65235a77 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444343c7230c0f947a666334fb895736fa4bc153
 2021-01-28 09:02:21 +00:00
Treehugger Robot
8334a265ad Merge "Note network interfaces based on transport" 2021-01-28 07:45:20 +00:00
Remi NGUYEN VAN
2c9ed7f32d Note network interfaces based on transport 
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.

Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.

This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.

Bug: 174436414
Test: atest
  atest ConnectivityServiceTest#testBatteryStatsNetworkType \
      --rerun-until-failure 40

Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
 2021-01-28 15:10:54 +09:00
Treehugger Robot
046ebf41b7 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: b0989fd2d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
 2021-01-27 13:57:34 +00:00
junyulai
fa528b2d20 [FUI03] No-op refactoring of VpnInfo 
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Move VpnInfo to android.net
  2. Add nullability annotations
  3. Make members final

Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
 2021-01-27 15:03:06 +08:00
Jeff Sharkey
6b2d1bb8c4 Merge "Add the owner for those files related to voice." am: 24bbd50cea am: 2a0549bc14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55d845133463c0e20cfa761a7c18ad50cd3f1dd2
 2021-01-26 00:08:05 +00:00
Jeff Sharkey
24bbd50cea Merge "Add the owner for those files related to voice." 2021-01-25 19:21:12 +00:00
Seigo Nonaka
6997779819 Merge "Add OWNERS for font manager related module" am: 61bb2cfccc am: 63c0ffd31e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557448

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic814c65f7885d9f1b0f25adcf6fdf1f7dab44cb4
 2021-01-25 17:17:30 +00:00
Seigo Nonaka
580f6ddeb2 Add OWNERS for font manager related module 
Bug: N/A
Test: N/A
Change-Id: I8a653349bd6df6365e1d6cbb2fc3b3ac10c8fcd7
 2021-01-22 10:07:27 -08:00
lpeter
7593a84876 Add the owner for those files related to voice. 
Bug: 177641730
Test: n/a
Change-Id: Ib693e399efd14acbc00a83421e1bff77fede6cd6
 2021-01-22 20:49:30 +08:00
Kohsuke Yatoh
782d427971 Merge "Add missing textservice OWNERS files." am: 0f4112a760 am: 49023f3cd8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeae70e9e0e68b1f0420c95676c3a2445c9433ef
 2021-01-21 01:00:21 +00:00
Kohsuke Yatoh
0f4112a760 Merge "Add missing textservice OWNERS files." 2021-01-20 23:16:33 +00:00
Kohsuke Yatoh
b1d2fe86f7 Add missing textservice OWNERS files. 
Test: n/a
Change-Id: I56939ce3a22c72ac489e4d9248de9e0ce4ee9413
 2021-01-20 18:53:11 +00:00
satayev
311ed3bc6a Merge "Allow clearing a single change id for tests usage." am: 2805c99594 am: 3bbe9c336f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie864851627231669743899b8e0d110635cee6c60
 2021-01-20 18:49:03 +00:00
satayev
1c8e894bd8 Merge "Refactor PlatformCompat and related files." am: 5d37ff2d33 am: 3cfd32b11f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553536

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia183bbd2338415608ad962e80336e05bc6d99612
 2021-01-20 18:48:02 +00:00
satayev
2805c99594 Merge "Allow clearing a single change id for tests usage." 2021-01-20 17:48:52 +00:00
Artur Satayev
21900cb6ee Allow clearing a single change id for tests usage. 
Add clearOverrideForTest(changeId, packageName) to remove a single id
from package overrdies.

Bug: 147113465
Test: N/A
Change-Id: I35c6fe418abb9bc562218444878188bc393725e5
 2021-01-20 14:15:14 +00:00
satayev
5d37ff2d33 Merge "Refactor PlatformCompat and related files." 2021-01-20 14:13:45 +00:00
Artur Satayev
5d640c39a3 Refactor PlatformCompat and related files. 
- Fix java style
- Remove some code duplication
- Remove redundant throws declarations for unchecked exceptions
- Fix javadoc typos

Bug: 147113465
Test: N/A
Change-Id: I723ddf3184e2da77f157340c4ef18e9395b99e60
 2021-01-20 11:21:40 +00:00
Treehugger Robot
5a1e5ac1ff Merge "Fixed Handler Leak on WrapperInit" am: 9c7e15ab31 am: d723dd9191 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495716

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14173b39846f2ef92698731b48dd4dd79d361b97
 2021-01-19 19:12:06 +00:00
Treehugger Robot
9c7e15ab31 Merge "Fixed Handler Leak on WrapperInit" 2021-01-19 18:05:04 +00:00
Treehugger Robot
2789600fdb Merge "Use API RouteInfo constructor in VpnConfig" am: 78426b28cc am: 5f2a3aca17 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib005c7b3c640f88e89868ff334aae5dcfd7f3852
 2021-01-18 06:04:45 +00:00
Treehugger Robot
78426b28cc Merge "Use API RouteInfo constructor in VpnConfig" 2021-01-18 05:08:58 +00:00
Roshan Pius
b8dd50f3b4 Merge "LocationPermissionChecker: Exempt privileged components from location check" am: 2324ff48be am: 3f78d1ce0a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45afdaba68269d59cfcf670ef7fdef6a19b3a9d2
 2021-01-18 02:52:29 +00:00
Roshan Pius
2324ff48be Merge "LocationPermissionChecker: Exempt privileged components from location check" 2021-01-18 01:33:31 +00:00
Zoey Chen
3ed50cfe93 Merge "[Telephony] PhoneStateListener redesign for new event" am: 3521a14be4 am: 26c225c0ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic283ea7e43bd3a2875acb5528f19ded0974ae42e
 2021-01-16 01:49:34 +00:00
Zoey Chen
3521a14be4 Merge "[Telephony] PhoneStateListener redesign for new event" 2021-01-16 00:56:51 +00:00
Jeff Sharkey
97eae7f9cc Merge "Add owners for locksettings related files" am: e768557623 am: fec42d6f3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1551936

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I202e553135198c01d9389966a1bf2913d4e7f507
 2021-01-15 17:06:01 +00:00
Jeff Sharkey
e768557623 Merge "Add owners for locksettings related files" 2021-01-15 16:02:26 +00:00
Rubin Xu
80c94ce1cc Add owners for locksettings related files 
Bug: 174932174
Test: builds
Change-Id: I2759a0387e55d0ce7e5fd14bb08a8018d7946c2d
 2021-01-15 16:00:08 +00:00
Roshan Pius
7692fba5c1 LocationPermissionChecker: Exempt privileged components from location check 
This is a port of the exemption that exists in WifiPermissionsUtil.
Settings, sysui, network stack needs to be able to access all network
state regardless of location toggle. If we want to move sysui, etc to
retrieve WifiInfo via NetworkCapabilities (which is the current plan),
this exemption is essential since UI should reflect wifi state
regardless of location toggle state.

Bug: 162602799
Test: atest LocationPermissionCheckerTest
Change-Id: I49ce465eccce27bb7a860d882360436fd9ec19c6
 2021-01-15 06:51:39 -08:00
Remi NGUYEN VAN
6f27155e9b Use API RouteInfo constructor in VpnConfig 
VpnConfig is planned to be outside of the connectivity module, so it
needs to use its public API and not private symbols.

Change the RouteInfo constructor to use the equivalent API version.

Bug: 174436414
Test: m
Change-Id: Iae264e9b50ec6e97ce39bd2bab6f22f5844bf270
 2021-01-15 23:44:49 +09:00
Zoey Chen
041679fa9a [Telephony] PhoneStateListener redesign for new event 
1. Add int EVENT_* and expose these as @SystemApi
 2. Add listener interface
 3. Deprecated LISTEN_*
 4. un/registerPhoneStateListener
 5. get event from event listener
 6. Add event to list

Test: manual and
atest TelephonyManagerTest#testRegisterPhoneStateListener
atest TelephonyManagerPermissionTest
atest CtsTelephonyTestCases:PhoneStateListenerTest
atest TelephonyRegistryManagerTest
atest CtsTelecomTestCases:android.telecom.cts.IncomingCallTest
atest CtsTelecomTestCases:android.telecom.cts.OutgoingCallTest

Bug: 167684594
Change-Id: Id89a541745fb8700e1ebd2cc162ee55cd1055661
Merged-In: Id89a541745fb8700e1ebd2cc162ee55cd1055661
 2021-01-14 16:58:33 +08:00
Chiachang Wang
e276fd4654 Merge "[IT4.21] Update the label type of idle timer" am: 4bdcbf4608 am: bf710b7402 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d54f242cee6171c8666efed21d83349366b7070
 2021-01-13 10:12:15 +00:00
Chiachang Wang
4bdcbf4608 Merge "[IT4.21] Update the label type of idle timer" 2021-01-13 09:10:43 +00:00
Chiachang Wang
3ce298dff1 [IT4.21] Update the label type of idle timer 
The first parameter of adding idle timer is an unique identity
to communicate between ConnectivityService and netd. Netd will
notify the activity change using the identity, so it's fine to
replace the legacy type with transport type since we should
deprecate the usage of legacy type.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ia00606539b86872cca9a92285bd940c8a720a033
 2021-01-13 14:10:15 +08:00
Benjamin Franz
9f7867cee2 Merge "Add new overridable annotation to platform compat" am: 458515e464 am: 899cd8920b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8c48feb66285ec4153d61eb83ff8967dae28adf
 2021-01-12 16:41:53 +00:00
Benjamin Franz
458515e464 Merge "Add new overridable annotation to platform compat" 2021-01-12 15:38:01 +00:00
Dmitri Plotnikov
ebb8dfe3e5 Merge "Add PowerEstimators to the per-file OWNERS" am: 36a792091e am: becbe17ac0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia67477b9f6c8f2216545e02d7c5822d0aff547ed
 2021-01-11 21:38:02 +00:00
Dmitri Plotnikov
f8248eb2eb Add PowerEstimators to the per-file OWNERS 
Test: N/A
Change-Id: I7777551640227d7bfefbaa68f03e82167be39237
 2021-01-11 10:50:28 -08:00
Treehugger Robot
50e657d126 Merge "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()"" am: dacb8190e1 am: 12c3e9264b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543472

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef6f466e4fd872f3a643a4d21b55350a7be3042
 2021-01-08 20:17:03 +00:00
Treehugger Robot
dacb8190e1 Merge "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()"" 2021-01-08 18:57:11 +00:00
Connor O'Brien
0648bad1b6 Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()" 
This reverts commit 2eb8ad6245.

Reason for revert: Bug: 177011744

Change-Id: Ib9f1c0bda7d6df1b75dbe409f96dab39c1659781
 2021-01-07 23:48:35 +00:00
Andrei-Valentin Onea
dd1d1cbacc Merge changes from topic "preinstall-overrides" am: 29ed176b46 am: d1ebbf5086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94c9aca60ff8d5eec190434a2a22338cb04d5922
 2021-01-07 17:35:17 +00:00
Benjamin Franz
1cd6acee87 Add new overridable annotation to platform compat 
With this CL the annotation is only digested, but has no behaviour
change yet. Eventually this annotation allows the annotated change id to
be overriden on non-debug builds

Bug: 174043039
Test: atest FrameworksServicesTests:PlatformCompatTest
Change-Id: Ibc1fce37085213b5a02155010189949e193f0882
 2021-01-07 14:54:48 +00:00
Andrei-Valentin Onea
29ed176b46 Merge changes from topic "preinstall-overrides" 
* changes:
  Add force_non_debuggable_final_build_for_compat
  Allow overriding compat config prior to install time.
 2021-01-07 14:04:12 +00:00
Connor O'Brien
51271ba04a Merge "Clear BPF data in KernelCpuUidTimeReader.removeUid()" am: d5e143eee7 am: c5a860d297 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e7d114ffec9c4fe9c2f5378ce89c80a92590015
 2021-01-07 01:09:20 +00:00
Connor O'Brien
d5e143eee7 Merge "Clear BPF data in KernelCpuUidTimeReader.removeUid()" 2021-01-06 23:38:12 +00:00
Jeff Sharkey
4079cfc439 Merge "Update OWNERS for NetInitiatedActivity.java" am: 7283ceda9b am: 23519fbda4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf148f26961add3f0b43c6e853b3ab526a53008c
 2021-01-05 17:16:55 +00:00
Jeff Sharkey
7283ceda9b Merge "Update OWNERS for NetInitiatedActivity.java" 2021-01-05 16:40:01 +00:00