Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,606 Commits 3 Branches 0 Tags
88aa5dfd70b16ec39895ba3c86a8a6f78d41ec08
Commit Graph

566606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
88aa5dfd70 Merge changes I2e52ff67,I9f2b2d0d am: f11ccc456b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661226

Change-Id: Icd8b937b0fca9ac4d8f32c688aa8b325cf563f65
 2021-04-02 00:06:29 +00:00
Benedict Wong
f11ccc456b Merge changes I2e52ff67,I9f2b2d0d 
* changes:
  Remove subIds from Telephony NetworkRequests.
  Switch to using status codes for Vcn
 2021-04-01 23:39:42 +00:00
Treehugger Robot
a1f2daa160 Merge "Add OWNERS for some native files" am: 20f4b99166 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653187

Change-Id: Icfda670f0a0b8c839f4bd92eb1113f56a2c965e4
 2021-04-01 22:59:57 +00:00
Treehugger Robot
20f4b99166 Merge "Add OWNERS for some native files" 2021-04-01 22:19:04 +00:00
Benedict Wong
8124f47d3f Remove subIds from Telephony NetworkRequests. 
Since NetworkProviders do not at present support requests with subIds
(they always provide an empty list, therefore never have an overlap),
the TelephonyBringupRequests must never present subIds as part of the
requested capabilities.

Bug: 183174340
Test: atest FrameworksVcnTests
Change-Id: I2e52ff67748c0ca226a648682b37dfe0996cb850
 2021-04-01 15:11:18 -07:00
Benedict Wong
bd1085ef03 Switch to using status codes for Vcn 
This change adds status codes, and switches the Vcn class to use these
to signal safe mode status. Additionally, this allows a distinction
between a VCN that is quitting and one that is simply in safe mode,
providing potential for an opportunistic safe mode where the VCN will
continue to attempt to serve NetworkRequests while not restricting
underlying networks.

Bug: 183174340
Bug: 181789060
Test: atest FrameworksVcnTests
Change-Id: I9f2b2d0d8d7b3ade19ca5adcd48cc920171bf8c3
 2021-04-01 15:11:17 -07:00
Paul Duffin
0430bb8fd7 Merge "Added platform-bootclasspath" am: dedc39bc2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660363

Change-Id: I2738dac3c1b8ab424127668925833d7e7635bc9e
 2021-04-01 19:10:24 +00:00
Paul Duffin
dedc39bc2c Merge "Added platform-bootclasspath" 2021-04-01 19:06:54 +00:00
Steven Moreland
47fdcc5151 Merge "Partial: ActivityManager: use proc state from compiled aidl" am: bd32be9d25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661237

Change-Id: Idd75bb70b64f3a28c9e3edb1c2dc23979a244272
 2021-04-01 19:02:24 +00:00
Cody Kesting
2fa4b7b757 Merge changes from topic "gateway-connection-id" am: 03f00e5a52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659162

Change-Id: I1f8c7f2c81a5088a0c91f59c3607a939d5d2e1d4
 2021-04-01 18:57:19 +00:00
Paul Duffin
e674eb6570 Merge "Fix presubmit for hidden api." am: cde72c6791 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661999

Change-Id: Ica1d13d418b5ea0712024faade7546903a59a217
 2021-04-01 18:51:44 +00:00
Steven Moreland
0fd713954b Merge "IBatteryStats.aidl update path" am: 2a27671122 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661234

Change-Id: I0679988981358ea676cacf6d1c5962d3057ebf57
 2021-04-01 18:47:51 +00:00
Steven Moreland
bd32be9d25 Merge "Partial: ActivityManager: use proc state from compiled aidl" 2021-04-01 18:33:54 +00:00
Steven Moreland
42c6e93fde Partial: ActivityManager: use proc state from compiled aidl 
In order to fix divergence in libbinder Android.bp file, adding an
empty file group corresponding to an internal file group.

This is needed to easily manipulate where source files are included
in libbinder without having to land patches internally and externally.

Bug: 183654927
Test: N/A

Merged-In: I3dafe7a75b2dae561583a7821284027a1896b9a5
Change-Id: I8821242efdc0a27daddf30368f948855062f2d14
 2021-04-01 18:30:28 +00:00
Cody Kesting
03f00e5a52 Merge changes from topic "gateway-connection-id" 
* changes:
  Expose API for identifying GatewayConnections.
  Update identification for onGatewayConnectionError().
 2021-04-01 18:27:28 +00:00
Paul Duffin
cde72c6791 Merge "Fix presubmit for hidden api." 2021-04-01 18:16:41 +00:00
Steven Moreland
2a27671122 Merge "IBatteryStats.aidl update path" 2021-04-01 18:08:11 +00:00
Aaron Huang
40b438abcc Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861

Change-Id: I1a21497634c2ee53abfca8dea4b8bab40cf28b3a
 2021-04-01 16:25:44 +00:00
Aaron Huang
e427565991 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" 2021-04-01 15:59:39 +00:00
Treehugger Robot
736e5ea3a5 Merge "Update OWNERS for OnReceiveContentListener and ContentInfo" am: 2990dccc16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661118

Change-Id: Ia6ef7e636fed0905bd93cde5d8eb774a73dd2844
 2021-04-01 14:20:29 +00:00
Treehugger Robot
2990dccc16 Merge "Update OWNERS for OnReceiveContentListener and ContentInfo" 2021-04-01 13:38:54 +00:00
Aaron Huang
112185f2fa Merge "Expose BIP and VSIM relavent definitions" am: ef74312993 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223

Change-Id: I1e9d92cd27fc0dcd84cc62ad7c2a591c9f5a54e5
 2021-04-01 12:26:04 +00:00
Aaron Huang
b1d55e7fb0 Merge "Move deduceRestrictedCapability to libs/net and rename it" am: c6725ad2bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999

Change-Id: I088dfe837eb986c2de792d0672a2e707112b6042
 2021-04-01 12:21:47 +00:00
Yury Khmel
72dad8a9d1 Fix presubmit for hidden api. 
grep returns 1 for if nothing was found. This fails presubmit hook due
to bash handling "set -e" Looks like grep not found is valid case.
This fixes this issue by bypassing grep exit code.

Test: Locally
Bug: 161351699
Merged-In: I39e926a348a0fb8f4040f86034affdb4204faac5
Change-Id: I39e926a348a0fb8f4040f86034affdb4204faac5
(cherry picked from commit e6a5253f12)
 2021-04-01 13:17:00 +01:00
Treehugger Robot
a087245e03 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581

Change-Id: Ie7cd2d43138155bce1adc3f518df9278bed2d4a2
 2021-04-01 12:14:11 +00:00
Aaron Huang
ef74312993 Merge "Expose BIP and VSIM relavent definitions" 2021-04-01 11:38:17 +00:00
Aaron Huang
c6725ad2bb Merge "Move deduceRestrictedCapability to libs/net and rename it" 2021-04-01 11:37:51 +00:00
Treehugger Robot
7226ad3729 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-01 11:27:29 +00:00
Paul Duffin
3e4ec3b53a Added platform-bootclasspath 
Change-Id: I20329dfd1c5beeaf91fb6f9435f79fb1e2ccbb2d
 2021-04-01 11:55:31 +01:00
Sergey Volnov
507ca766ac Merge "Add a comment to speech recognition service requiring clients targeting Android 11 to specify a <queries> tag." am: 8c6820048d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660358

Change-Id: Iffbe962bb5fa16fafba08bb1b91c35f6de8116b5
 2021-04-01 10:05:25 +00:00
Sergey Volnov
8c6820048d Merge "Add a comment to speech recognition service requiring clients targeting Android 11 to specify a <queries> tag." 2021-04-01 09:26:27 +00:00
Chalard Jean
e965720924 Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998

Change-Id: I7ab3a57e07a2e48dabb95dd6f671176727d58cdb
 2021-04-01 08:44:55 +00:00
Jack Yu
6d858e4d0b Merge "Display no data notification in certain scenarios" am: 39e56169aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660341

Change-Id: Ia109fdd98007e1cc6d09fae4b3c09e931e2210e4
 2021-04-01 08:40:56 +00:00
Chalard Jean
7151f51c5a Merge "Fix testLegacyLockdownVpn flaky" 2021-04-01 08:19:53 +00:00
Jack Yu
39e56169aa Merge "Display no data notification in certain scenarios" 2021-04-01 08:11:25 +00:00
Treehugger Robot
d68b21d215 Merge "MTP: Add thumbnail generation for JPG" am: 5aac2c84ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657579

Change-Id: I5b48ef9dd06402401ad806ad28138ee35d222206
 2021-04-01 06:52:16 +00:00
Chalard Jean
ea4d25a750 Fix testLegacyLockdownVpn flaky 
When WiFi disconnects, the VPN disconnects immediately. The
broadcast can therefore be sent before the broadcast receiver is
registered, which causes the receiver to not see the broadcast.

The puzzling part is that CONNECTIVITY_ACTION is a sticky
broadcast, so one would expect the broadcast to still be
received, even if the registration is done after the broadcast
is sent. The reason this doesn't happen is that the context used
by the test is a BroadcastInterceptingContext, which does not
treat sticky broadcasts as sticky.

Bug: 184115648
Test: atest --iterations 1000 'ConnectivityServiceTest#testLegacyLockdownVpn'
Change-Id: Ib44c92839d25951cc7d2db0f923e1b104690e1e0
 2021-04-01 06:27:46 +00:00
Treehugger Robot
5aac2c84ba Merge "MTP: Add thumbnail generation for JPG" 2021-04-01 06:20:56 +00:00
Aaron Huang
42951ddb37 Move some constants from TrafficStatsConstants to NetworkStackConstants 
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
 2021-04-01 05:10:03 +00:00
Chiachang Wang
36a95aa83a Merge "Add required permission to FrameworksNetIntegrationTests" am: 4f62a89c9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659

Change-Id: Ie6f855ec7fd19a565344b817a60abdc5263a2cfa
 2021-04-01 03:19:33 +00:00
James Mattis
f9cf886d53 Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222

Change-Id: Iec83a93593e52cdb2baf12fa76c70af9df263ee4
 2021-04-01 03:15:42 +00:00
Chiachang Wang
4f62a89c9e Merge "Add required permission to FrameworksNetIntegrationTests" 2021-04-01 03:15:07 +00:00
Bob Badour
de423b7a58 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  drm/java/Android.bp
  graphics/java/Android.bp
  identity/Android.bp
  identity/java/Android.bp
  keystore/java/Android.bp
  location/java/Android.bp
  location/tests/Android.bp
  lowpan/java/Android.bp
  media/mca/effect/java/Android.bp
  media/mca/filterfw/java/Android.bp
  media/mca/filterpacks/java/Android.bp
  mime/java/Android.bp
  mms/java/Android.bp
  opengl/java/Android.bp
  rs/java/Android.bp
  sax/java/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  telecomm/java/Android.bp
  telephony/common/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  telephony/java/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I2ee0af9ce8f74de2172b359b41d2c52a8b8f7e6c
 2021-03-31 19:55:25 -07:00
James Mattis
6269d2eb7a Merge "Calling linkToDeath on binder in NRI constructor" 2021-04-01 02:38:58 +00:00
Suprabh Shukla
2589a31c90 Add required permission to FrameworksNetIntegrationTests 
Test: atest FrameworksNetIntegrationTests

Fixes: 184166194
Change-Id: I7ad920ba5962f9c71c3c3db86809e7cb6b934425
 2021-03-31 18:52:04 -07:00
Steven Moreland
de4e95ed68 IBatteryStats.aidl update path 
header moved

Bug: 183654927
Test: N/A
Change-Id: I5a74323f14da8aec636b4dea6eb22eae528556be
 2021-03-31 23:46:34 +00:00
Jack Yu
7b8ac258b5 Display no data notification in certain scenarios 
For some carriers, display no data notification when
setup data permanently failed (i.e. retry will not hapen)

Bug: 169648447
Test: Manual
Merged-In: Ica20169db3c9230172d2cae80a9e6ba3486bfa42
Change-Id: Ica20169db3c9230172d2cae80a9e6ba3486bfa42
(cherry picked from commit 5badb094f5)
 2021-03-31 16:36:35 -07:00
Treehugger Robot
64c20457e2 Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4ad7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660361

Change-Id: I95596d0d596cdebdd64c61094da6c4e5083fc95d
 2021-03-31 22:47:18 +00:00
Treehugger Robot
222b1e4ad7 Merge "When a dex file is loaded with different contexts, dexopt with "verify"." 2021-03-31 22:44:25 +00:00
Hall Liu
ff4a4a29e7 Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358163

Change-Id: I30c6340d335e738b016d1f69f6461951d42b631c
 2021-03-31 22:41:23 +00:00