Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
466,666 Commits 3 Branches 0 Tags
307f10a4fc57f98b8ecddfca4e9b0d97cca5e089
Commit Graph

101802 Commits

Author SHA1 Message Date
Song Pan
307f10a4fc Merge "Implement the InstallerAllowedByManifest rule." 2020-02-13 16:22:10 +00:00
Song Pan
6a0fd8b041 Implement the InstallerAllowedByManifest rule. 
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/integrity
Test: atest frameworks/base/core/tests/coretests/src/android/content/integrity
Bug: 148780440
Change-Id: Ie452e2a8a93b31ee91ae6d3e119212684c022c6a
 2020-02-13 13:56:28 +00:00
Wale Ogunwale
595316bb20 Merge "Revert "Revert "Revert "Enable insets flag for IME"""" 2020-02-13 13:18:56 +00:00
Wale Ogunwale
13c9a90696 Revert "Revert "Revert "Enable insets flag for IME""" 
This reverts commit 925c658631.

Reason for revert: Causing WindowManager pre-submits to fail.

Change-Id: I11dfc87e7fb2741b237688865eeefbd9e29dc981
 2020-02-13 13:17:45 +00:00
Automerger Merge Worker
4bfcfe795f Merge "Add Intdef annotation for eventId in logEvent" am: 3fa7b28384 am: 0dbbbdf479 am: bf3b421486 
Change-Id: I7caa207fb35e8088e50de0651a72a6d9628e7ce2
 2020-02-13 11:24:43 +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
Bernardo Rufino
83d9034a37 Merge "Use SDK_INT constant in the javadoc of SAW intents" 2020-02-13 10:52:01 +00:00
Chiachang Wang
3fa7b28384 Merge "Add Intdef annotation for eventId in logEvent" 2020-02-13 10:44:57 +00:00
Alex Johnston
7ab8a28306 Merge "Rename lockdown admin configured networks API" 2020-02-13 09:51:00 +00:00
Bernardo Rufino
c692869c1e Use SDK_INT constant in the javadoc of SAW intents 
Instead of hardcoding 11.

Bug: 146563745
Test: Builds
Change-Id: I3e4002134010558b224492512bd76958edc8e4dc
 2020-02-13 08:51:22 +00:00
Automerger Merge Worker
98e89b627c Merge "Fix incorrect interpolation of active bucket for partial requests." am: 96e15285ad am: 96fc3f8e20 am: b8da3eb33d 
Change-Id: I3a7df5061e0a2a90231072a5cd3e8c799302b346
 2020-02-13 08:26:15 +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
Chiachang Wang
a0608fd20e Merge "Add permission check for CaptivePortal#reevaluateNetwork" 2020-02-13 06:25:32 +00:00
Kevin Chyn
e38367008f Merge "Biometric phenotype updates" 2020-02-13 04:40:05 +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
Amy Zhang
8527147b3d Merge changes from topic "tuner-rm" 
* changes:
  Add a TunerResourceManagerService as an Android System Serivce.
  Add Lnb related APIs into the TunerResourceManager interface
  Add Cas related APIs into the Tuner Resource Manager
  Adding ITunerResourceManagerService interface into android.media.tv
 2020-02-12 23:48:29 +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
Siarhei Vishniakou
b0f1fe887a Merge "New VerifiedInputEvent api" 2020-02-12 22:55:00 +00:00
Kevin Chyn
eab9fe1560 Biometric phenotype updates 
1) Always update strength after registerAuthenticator. Otherwise the
   flag will not be applied (e.g. after reboot)
2) Add strings for onAuthenticationError

Bug: 148419762

Test: manual
Test: atest BiometricServiceTest

Change-Id: Ia20a91e401d6753b55d6aa4a36d487fc15465ba5
 2020-02-12 14:54:31 -08:00
Alex Buynytskyy
1580e1c391 Merge "Signature streaming from local file, property to disable incremental." 2020-02-12 22:31:01 +00:00
Zach Johnson
c425dc2958 Merge "Revert "Require user pass in a non-null BluetoothDevice to all B..."" 2020-02-12 21:39:47 +00:00
Taran Singh
31af9f3ea6 Merge "Revert "Revert "Enable insets flag for IME""" 2020-02-12 21:24:24 +00:00
Curtis Belmonte
5cf71d715e Merge changes from topic "bio_service_restrict" 
* changes:
  Make BiometricService check for internal permission
  Configure BiometricPrompt to use AuthService.
 2020-02-12 19:29:04 +00:00
Alex Buynytskyy
8e9e6a3255 Signature streaming from local file, property to disable incremental. 
+Tests

Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest
Bug: b/136132412 b/133435829

Change-Id: I826900e120c72e7cdd0549c70da28d817982dcd3
 2020-02-12 11:24:47 -08:00
Alex Buynytskyy
780d2bb75d Merge "v4 signing schema parsing and verification." 2020-02-12 19:19:06 +00:00
Taran Singh
925c658631 Revert "Revert "Enable insets flag for IME"" 
This reverts commit d01913ae83.

Reason for revert: We're ready to re-enable the flag since b/149121559 is fixed

Change-Id: I1aca81bb6c2dbb544841a2a6d17ef477cb8bdc9e
 2020-02-12 19:07:46 +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
Philip P. Moltmann
0946037764 Merge "Revert "Revert "Activity start: Send featureId from context->AppOpsManager""" 2020-02-12 18:52:23 +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
Philip P. Moltmann
ee29509ecd Revert "Revert "Activity start: Send featureId from context->AppOpsManager"" 
This reverts commit e7421e92d9.

Exempt-From-Owner-Approval: revert-revert and only piping anyway
Test: 1:1 revert-revert
Bug: 136595429
Change-Id: I44e5fa2019f5604c6e2c08bdd1967129c64a90a7
 2020-02-12 18:51:53 +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
TreeHugger Robot
0fe79c3fe2 Merge "Revert "System API used by telephony to bind to WapPushManager app."" 2020-02-12 18:23:59 +00:00
Eino-Ville Talvala
53e0762358 Merge "Camera NDK: New lifecycle for ACameraMetadata_fromCameraMetadata" 2020-02-12 18:09:33 +00:00
Automerger Merge Worker
e5bbdcfcf5 Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." am: 3939d29c0b am: b3a0f10a8e am: 8a175acf37 
Change-Id: Iae8c37ceeae1616b2b0edc43248e72f3de082f20
 2020-02-12 17:50:39 +00:00
Alex Buynytskyy
036864b62c v4 signing schema parsing and verification. 
v4 is a streaming add-on to the existing v2/v3 schemas.

Flow:
- APK is signed with v2/v3 and v4 signature blocks,
- on installation, v4 signature bytes are stored next to the APK in
hidden block,
- on each read from APK, kernel verifies the v4 signature using
fs-verity-like code,
- on parsing/verification, we extract certificates from kernel and
compare them with certificates extracted from v2/v3 signature block.

By doing this we are making sure that v4 signature is produced by developer and original APK bytes are not changed.

Test: atest PkgInstallSignatureVerificationTest
Bug: b/136132412 b/133435829
Change-Id: Ia2a56c82c9864bf65e1338700dfe51abf6800deb
 2020-02-12 09:46:06 -08:00
TreeHugger Robot
98a201dcd9 Merge "Finalize @SystemApi annotation for StatsFrameworkInitializer (retry)" 2020-02-12 17:36:49 +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
Florian Mayer
fab4628666 Merge "Do not disable tracing in zygote." 2020-02-12 17:28:07 +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