Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
444,251 Commits 3 Branches 0 Tags
01bb7cef0ede86d6f55379b70e2d73a2cae8eaa2
Commit Graph

97318 Commits

Author SHA1 Message Date
Automerger Merge Worker
01bb7cef0e Merge "Update InCallService API docs." am: 11e7b55ea9 am: 040db280fa 
Change-Id: Id6df82c6284b2cc027dba1d2b355806888185761
 2020-02-13 19:26:10 +00:00
Automerger Merge Worker
040db280fa Merge "Update InCallService API docs." am: 11e7b55ea9 
Change-Id: Ica011ce75760d1d7338c3accdf29dc7505fd9949
 2020-02-13 19:09:01 +00:00
Tyler Gunn
11e7b55ea9 Merge "Update InCallService API docs." 2020-02-13 18:48:00 +00:00
Automerger Merge Worker
2ddf24b6a8 Merge "Do not disable tracing in zygote." am: 88be2985c4 am: aee51d9eab 
Change-Id: I8b6280d305ea53c5361442e4b7bb45aa164fb5d2
 2020-02-13 16:20:06 +00:00
Automerger Merge Worker
aee51d9eab Merge "Do not disable tracing in zygote." am: 88be2985c4 
Change-Id: If850e4ff9da2b0c1259a366caac1fd95a8eb1c3c
 2020-02-13 16:07:04 +00:00
Florian Mayer
88be2985c4 Merge "Do not disable tracing in zygote." 2020-02-13 15:53:06 +00:00
Automerger Merge Worker
bf3b421486 Merge "Add Intdef annotation for eventId in logEvent" am: 3fa7b28384 am: 0dbbbdf479 
Change-Id: I347743db825730d5c1d3b0e56b7527ce9cb3df02
 2020-02-13 11:10:15 +00:00
Automerger Merge Worker
0dbbbdf479 Merge "Add Intdef annotation for eventId in logEvent" am: 3fa7b28384 
Change-Id: Ic9b5ea605164340d5c2461eb7a1a752bb5b36bad
 2020-02-13 10:56:35 +00:00
Chiachang Wang
3fa7b28384 Merge "Add Intdef annotation for eventId in logEvent" 2020-02-13 10:44:57 +00:00
Automerger Merge Worker
b8da3eb33d Merge "Fix incorrect interpolation of active bucket for partial requests." am: 96e15285ad am: 96fc3f8e20 
Change-Id: I1d6aa0c23fd227eca478e4a6ab5fd7dd26e4c297
 2020-02-13 08:07:01 +00:00
Automerger Merge Worker
96fc3f8e20 Merge "Fix incorrect interpolation of active bucket for partial requests." am: 96e15285ad 
Change-Id: Ibfaf1e3d13ce758323c30381ba44702b6016d9eb
 2020-02-13 07:53:18 +00:00
Maciej Żenczykowski
96e15285ad Merge "Fix incorrect interpolation of active bucket for partial requests." 2020-02-13 07:37:57 +00:00
Automerger Merge Worker
b41fe0a9a3 Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: 4940da0b98 am: 8c5e78eae6 
Change-Id: Iebeb70078906b5eb12b17ee14c8ac7ea749917b2
 2020-02-13 07:09:24 +00:00
Automerger Merge Worker
8c5e78eae6 Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: 4940da0b98 
Change-Id: I2f9de2582025c8fc3782870b8c561ce2002abaf8
 2020-02-13 06:54:50 +00:00
Chiachang Wang
4940da0b98 Merge "Add permission check for CaptivePortal#reevaluateNetwork" 2020-02-13 06:41:53 +00:00
Chiachang Wang
35ca498d8d Add Intdef annotation for eventId in logEvent 
Follow API guide.

Bug: 148379628
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I410ef06b2fa82d8ef35513086733b0fc2cf0fe06
 2020-02-13 06:26:35 +00:00
Automerger Merge Worker
b4a6263610 Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 617b4b00e3 am: 438129f4aa 
Change-Id: I5784b867346a280307966721cd47e562fffcbe17
 2020-02-13 00:06:04 +00:00
Automerger Merge Worker
438129f4aa Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 617b4b00e3 
Change-Id: I00dd341f699d2a22cc3d190b43314a49bee9062a
 2020-02-12 23:55:00 +00:00
Roshan Pius
617b4b00e3 Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" 2020-02-12 23:36:13 +00:00
Roshan Pius
1a188ab4f5 Revert "NetworkRequest: Embed requestor uid & packageName" 
This reverts commit 3e63df535a.

Reason for revert: b/149425896
Bug: b/149425896

Change-Id: I9fe31509c040cc421ccb00ea60f15e6f199e8bc6
 2020-02-12 23:33:43 +00:00
Automerger Merge Worker
050d6c11d5 Merge "NetworkRequest: Embed requestor uid & packageName" am: 9dd718c5d9 am: 894c9db9f5 
Change-Id: Icdf8417670f1ff3e68f90d8c3dc5a52d9c024f00
 2020-02-12 18:58:41 +00:00
Automerger Merge Worker
d2b4bbb15c Merge "Add @Nullable and @NonNull to module API" am: 04ee825346 am: d785329abb 
Change-Id: I89ff5004e3df1cde65390cbdb7119ebb47637091
 2020-02-12 18:58:09 +00:00
Automerger Merge Worker
894c9db9f5 Merge "NetworkRequest: Embed requestor uid & packageName" am: 9dd718c5d9 
Change-Id: Ic4f9247e18a9d1cc22b26500b47da1af2d9b011d
 2020-02-12 18:51:59 +00:00
Qingxi Li
9dd718c5d9 Merge "NetworkRequest: Embed requestor uid & packageName" 2020-02-12 18:43:32 +00:00
Automerger Merge Worker
d785329abb Merge "Add @Nullable and @NonNull to module API" am: 04ee825346 
Change-Id: I61943d8e33dc94d780401448a8acc716966a5763
 2020-02-12 18:42:53 +00:00
Florian Mayer
5845bdf66e Do not disable tracing in zygote. 
We now use the sequence number of the atrace tag rather than a Binder
transaction, so zygote can observe changes to the tags.

Test: m
Bug: 137366208
Bug: 147667830

This is a cherry-pick of e38797be84.

Change-Id: I50e32a19c538dd255097c035836504b4746b172b
Merged-In: I50e32a19c538dd255097c035836504b4746b172b
 2020-02-12 17:35:15 +00:00
Automerger Merge Worker
8a175acf37 Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." am: 3939d29c0b am: b3a0f10a8e 
Change-Id: Ifc6f6a919986305002d2e2c60aa3cda8f0b8b5ac
 2020-02-12 17:32:19 +00:00
Cody Kesting
b3a0f10a8e Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." 
am: 3939d29c0b

Change-Id: If2157b0dd7d62560c77318b76e0d7d2a66c09644
 2020-02-12 09:16:41 -08:00
Anton Hansson
7f94169e56 Add @Nullable and @NonNull to module API 
These two annotations are already in the public/system stubs,
but are re-written to be package private instead of public. This
makes them inaccessible to libs building against these stubs.

When setting sdk_version:<X>, the stubs of X will appear before any
other libraries on the classpath. This also makes it impossible for
modules to add Nullable annotations of their own when setting sdk_version.

Exposing these annotations as public in the module stubs makes it
possible for modules using these annotation to specify an sdk_version.

Bug: 146758669
Test: m
Test: downstream CLs using sdk_version:module_current
Change-Id: I71fb766d02f833ed9a1b3a7dbfbc1c8118882b30
Merged-In: I71fb766d02f833ed9a1b3a7dbfbc1c8118882b30
(cherry picked from commit c8fc90a0c2b04a5f6f5e6006155ca1e9a09db4e3)
 2020-02-12 17:12:06 +00:00
Cody Kesting
3939d29c0b Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." 2020-02-12 16:38:38 +00:00
Chiachang Wang
b665970f8d Add permission check for CaptivePortal#reevaluateNetwork 
CaptivePortal#reevaluateNetwork is added as a system API which
requires a proper permission check.

Bug: 148379628
Test: Manually check with captive portal
Test: atest FrameworksNetTests
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I3f974339d5bd53a6f6ecb0842c02a8264dc3a5f9
Merged-In: I559d42089aeb09801d14c251c5165fca793c3cb3
 2020-02-12 11:29:24 +00:00
Automerger Merge Worker
b02723fb0a Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d am: 6185ee9556 
Change-Id: Ie9e18056da529defae5c5a0065607cd972d30b80
 2020-02-12 06:35:42 +00:00
Automerger Merge Worker
9460f658e4 Add a systemapi constructor for NetworkAgent am: 6dc9854996 am: b9e9fcbc88 
Change-Id: I091a6c7d8e92c22ca9393b5c974fcda5356d4102
 2020-02-12 06:35:39 +00:00
Automerger Merge Worker
6185ee9556 Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d 
Change-Id: I6eb675ddfa609dcc3031e916ce49959e42cf53f6
 2020-02-12 06:25:49 +00:00
Automerger Merge Worker
b9e9fcbc88 Add a systemapi constructor for NetworkAgent am: 6dc9854996 
Change-Id: I3fa3ec32d3c580ba0b7f2d515e08d27dd6af5bcd
 2020-02-12 06:25:42 +00:00
Chalard Jean
7fa63afe6d Merge changes Ibc9b1965,I288ea32f 
* changes:
  Fix invalid usage of javadoc
  Add a systemapi constructor for NetworkAgent
 2020-02-12 06:10:32 +00:00
Aaron Huang
9be870d8bd Fix invalid usage of javadoc 
CP from ag/10125651

Test: this change removes invalid usage
Change-Id: Ibc9b1965ec7aa545c0dae71d741c3802d3a9fa12
Merged-In: I35fc4a814238635fa95981649c27230dda319afa
 2020-02-12 06:10:10 +00:00
Automerger Merge Worker
9e1ab88bd0 Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 0f19f99cf6 am: b5b5ebd1a9 
Change-Id: Icc69f682437baf209aa537820201be45db6ccf3a
 2020-02-12 05:11:59 +00:00
Automerger Merge Worker
b5b5ebd1a9 Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 0f19f99cf6 
Change-Id: I4d352ed54671ce77ebbcaa9f0808a0ef703d3c6f
 2020-02-12 04:54:02 +00:00
Roshan Pius
3e63df535a NetworkRequest: Embed requestor uid & packageName 
Add the requestorUid & requestorPackageName fields to
NetworkCapabilities. This is populated by CS when
a new network request is received.
These 2 requestor fields are also optionally used for network
matching. All of the regular app initiated requests will have the
requestor uid and package name set by connectivity service. Network
agents can optionally set the requestorUid and requestorPackageName
to restrict the network created only to the app that requested the network.

This will help removing the necessity for the various specifiers to embed
the uid & package name info in the specifier for network matching.

Note: NetworkSpecifier.assertValidFromUid() is deprecated & removed in
favor of setting the uid/package name on the agent to restrict the
network to a certain app (useful for wifi peer to peer API & wifi aware).

Bug: 144102365
Test: Verified that wifi network request related CTS verifier tests
pass.
Test: Device boots up and connects to wifi networks
Change-Id: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529
Merged-In: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529
 2020-02-12 04:42:58 +00:00
Treehugger Robot
0f19f99cf6 Merge "[SP10] Add IntDef annotations for system api of NetworkStats" 2020-02-12 04:37:55 +00:00
Automerger Merge Worker
f0b9f042de Merge "Add HomeVisibilityObserver APIs in ActivityManager." am: cb47d86158 am: c1363ad2b9 
Change-Id: If7b65fd40532a8868463a5d545da5c197676ffe8
 2020-02-11 21:34:57 +00:00
Automerger Merge Worker
c1363ad2b9 Merge "Add HomeVisibilityObserver APIs in ActivityManager." am: cb47d86158 
Change-Id: Ib48d687e8da2941fa3385aa5066e4d490b1d3ad8
 2020-02-11 21:10:48 +00:00
Xiangyu/Malcolm Chen
cb47d86158 Merge "Add HomeVisibilityObserver APIs in ActivityManager." 2020-02-11 21:00:16 +00:00
Cody Kesting
7064b5c25a Include NetworkCapabilities and LinkProperties in DataStallReport. 
DataStallReport is updated to include the NetworkCapabilities and Link
Properties for the Network being reported on. This provides a more
complete picture of the Network conditions when the suspected data stall
was detected.

Bug: 148966398
Test: atest FrameworksNetTests
Change-Id: I913cf18c348b9f688f9d2a3d25a71bc94eb8f000
 2020-02-11 08:50:59 -08:00
junyulai
d859855a04 [SP10] Add IntDef annotations for system api of NetworkStats 
Test: m -j
Bug: 130855321
Change-Id: I8855ec95d5d086fc14e2eb71558bc2dcd9a830e5
 2020-02-11 09:47:03 +00:00
Chalard Jean
6dc9854996 Add a systemapi constructor for NetworkAgent 
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
      make doc-comment-check-docs
Change-Id: I288ea32fac07a9a486e2ea451a2c9b098446a74c
Merged-In: I288ea32fac07a9a486e2ea451a2c9b098446a74c
 2020-02-11 16:26:10 +08:00
Aaron Huang
a77fbc2539 Merge "Fix review comments on aosp/1213524" 2020-02-11 03:33:08 +00:00
Automerger Merge Worker
87adc2705f Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" am: 88fba38a1c am: 940853b36f 
Change-Id: If38d061113e23af9f7edc4609130bd13b3466686
 2020-02-10 23:40:42 +00:00
Automerger Merge Worker
940853b36f Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" am: 88fba38a1c 
Change-Id: If1599cabe081cd259051ffd36e2a597443919de7
 2020-02-10 23:29:58 +00:00