Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
626,766 Commits 3 Branches 0 Tags
685bbb18fe777df86eeead51bfe30527b0850406
Commit Graph

626766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Grafov
685bbb18fe Allow WiFi module to request grants from KeyChain 
Bug: 160457441
Test: atest MixedDeviceOwnerTest#testAddNetworkWithKeychainKey_granted
Test: atest MixedDeviceOwnerTest#testAddNetworkWithKeychainKey_notGranted
Test: atest MixedManagedProfileOwnerTest#testAddNetworkWithKeychainKey_granted
Change-Id: I89d753f9000ef2616ffbe3df11c003ac54ddee26
 2021-03-05 13:05:03 +00:00
Pavel Grafov
bf528538f1 DPM API to grant keys to Wifi 
Bug: 160457441
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testKeyManagement
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testDelegatedCertInstallerDirectly
Change-Id: I3a8be9de738ffcc7732e8a640bf42220ab340501
 2021-03-05 13:04:57 +00:00
Joanne Chung
7e3f7d1061 Merge "Add shell commands and dump information for Translation" into sc-dev 2021-03-02 11:39:07 +00:00
Charles Chen
0de1d7f1a5 Merge "Migrate SystemGesturePointerEventListener to WindowContext" into sc-dev 2021-03-02 11:12:02 +00:00
Lorenzo Colitti
2573939d60 [automerger skipped] Merge "DO NOT MERGE: Delete the last remaining user of TestNetworkStackLib." into mainline-prod am: ae64e2b7e9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13737397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30fd4e9ee8dbb0be886da2910541720c2d620246
 2021-03-02 10:47:16 +00:00
András Klöczl
300e416b7b Merge "Prevent using invalid result uri during multi user image change" into sc-dev 2021-03-02 10:27:42 +00:00
Kholoud Mohamed
dcbd16339d Merge "Expose some testAPIs in DPM" into sc-dev 2021-03-02 10:03:14 +00:00
TreeHugger Robot
05955bd175 Merge "Enable CEC version limiting tests" into sc-dev 2021-03-02 10:00:45 +00:00
Lorenzo Colitti
ae64e2b7e9 Merge "DO NOT MERGE: Delete the last remaining user of TestNetworkStackLib." into mainline-prod 2021-03-02 09:57:14 +00:00
Steven Ng
2f395f337e Merge "Replace getResourceId default 0 with Resources.ID_NULL" into sc-dev 2021-03-02 09:56:52 +00:00
Kriti Dang
f2a12691aa Merge "Adding public API to expose DisplayInfo.deviceProductInfo" into sc-dev 2021-03-02 09:19:44 +00:00
Oli Lan
80756895f2 Merge "Fix cross-user clipboard issue." into sc-dev 2021-03-02 09:09:15 +00:00
TreeHugger Robot
e6b7ca4b95 Merge "Added CarService Privileged permissions to xml files" into sc-dev 2021-03-02 08:35:48 +00:00
Lorenzo Colitti
582af98805 DO NOT MERGE: Delete the last remaining user of TestNetworkStackLib. 
FrameworksNetIntegrationTests is the last user of this target.
It is not really necessary since it can trivially be replaced by
NetworkStackApiStableLib.

Bug: 167645754
Test: atest FrameworksNetIntegrationTests
Ignore-AOSP-First: change is already in AOSP
Change-Id: Id5e8eb3f58590f4b3cfbcbef66b00acbba77a7a7
 2021-03-02 17:19:19 +09:00
Mayank Garg
c2df5ca25c Added CarService Privileged permissions to xml files 
Bug: 177455922
Test: m
Change-Id: I68206ab450bfce692d126d264e6326f7b71c1bc6
 2021-03-01 23:05:48 -08:00
Joanne Chung
af76755ff7 Update ContentCaptureContext to have a token information 
In order to support auto translation, we need to give information to
content capture service to let the app can use this information to
find the Activity which needed to be translated.

It's not safe to provide an activity token to the client app directly
even if it is a privilege app. They can use this activity token to
access many activity/windows related functions. We create a new token
for use for content capture and translation. This token will be used
get the target Activity for translation new APIs.

This change focuses on the Content capture API change, the API change
about translation will be done in the next change,

Bug: 177789967
Test: manual. Make sure cc service can get the information.
Test: atest android.view.contentcapture.ContentCaptureContextTest
Test: atest CtsContentCaptureServiceTestCases

Change-Id: Ife8096a8bd1e71ce4e686d95043e347222ad7ee6
 2021-03-02 06:47:48 +00:00
Amy Zhang
ea5f042755 Merge "Add hasSystemFeature API implementation of native PackageManager in PackageManager java service" into sc-dev 2021-03-02 05:21:53 +00:00
Ryan Lin
d37ca1e626 Merge "Fix touchexploration multi-finger gesture conflict" into sc-dev 2021-03-02 05:06:47 +00:00
Wei Sheng Shih
a3b84a9a62 Merge "Extract StartingSurface interface on WMShellBaseModule(7/N)" into sc-dev 2021-03-02 04:50:28 +00:00
Galia Peycheva
fd98c576c7 Merge changes from topic "add-runtime-blur-disabling" into sc-dev 
* changes:
  Create listener for dynamic blurEnabled changes
  Make WM.LP.blurBehindRadius a setter+getter
 2021-03-02 04:45:06 +00:00
TreeHugger Robot
fcbd636eb2 Merge "Print invalid domains to pm get-app-links" into sc-dev 2021-03-02 03:32:40 +00:00
Winson Chiu
9aee9ad8e5 Merge "Update app links resolution to handle no category Intents" into sc-dev 2021-03-02 03:23:34 +00:00
Seigo Nonaka
444dc3366b Merge "Rename DancingScript and CutiveMono" into sc-dev 2021-03-02 02:45:01 +00:00
Amy Zhang
6be61ca435 Add hasSystemFeature API implementation of native PackageManager in PackageManager 
java service

Test: local tested on Cuttlefish
Bug: 181602702
Change-Id: I69ed4a56edf9939ebe835a60d9a2e0127b86b3c0
 2021-03-02 02:30:32 +00:00
Arthur Hung
a88a2b5873 Merge "Revert "Introduce SingleKeyGestureDetector to PhoneWindowManager"" into sc-dev 2021-03-02 02:30:13 +00:00
Hui Yu
399d1407f8 Merge "setTemporaryAppWhitelistDuration(long duration) is deprecated." into sc-dev 2021-03-02 01:49:36 +00:00
Meng Wang
1447d4c9b7 Merge "Allow privapp ImsServiceEntitlement read/modify phone state" into sc-dev 2021-03-02 01:45:52 +00:00
Joanne Chung
af6aec86c4 Merge "Optimization: find views in single traversal." into sc-dev 2021-03-02 01:36:02 +00:00
Louis Chang
6a26f105b6 Merge "Do not update calling pid/uid if the task cannot be relinquished" into sc-dev 2021-03-02 01:16:44 +00:00
Winson
2db8c825d2 Update app links resolution to handle no category Intents 
If an Intent has no categories except DEFAULT, and there is only 1
non-browser result resolved along with 1+ browsers, the set of browsers
will be ignored and app links will be run as if the intent was resolved
with the BROWSABLE category.

This means callers who omit BROWSABLE but resolve to only 1 app +
browsers will automatically launch into the app.

Bug: 181570854

Test: manual, am start launch test intents

Change-Id: I1adfd41c64abd46dc98930ba36409550955275a9
 2021-03-01 17:11:21 -08:00
Lucas Dupin
965c170d50 Merge "Make WallpaperColors hints public" into sc-dev 2021-03-02 01:07:05 +00:00
Yan Yan
d033e4ff51 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7 am: 768da4ffc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a534378b7dc3a07784dc84400bc1460423e1270
 2021-03-02 00:56:57 +00:00
Andy Hung
1123c38bec Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" into sc-dev 2021-03-02 00:46:25 +00:00
Michael Wachenschwanz
25d3dbc104 Merge "Retry AppStandbyControllerTest bucket checking" into sc-dev 2021-03-02 00:41:31 +00:00
Songchun Fan
26f84ed66f Merge "[incremental] change build rules to not to use aidl_interface" into sc-dev 2021-03-02 00:33:12 +00:00
Pinyao Ting
f883f17436 Merge "Shortcut integration with AppSearch (Part 3)" into sc-dev 2021-03-02 00:32:02 +00:00
Jerry Chang
2f3b22c90a Merge "Fix dismissing wrong stage when droping divider to the edge" into sc-dev 2021-03-02 00:24:43 +00:00
Yan Yan
768da4ffc0 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I413a7801db110980b3da7147b2ce29c867a1d2fc
 2021-03-02 00:12:32 +00:00
Bob Badour
af1ec28daa Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into rvc-qpr-dev-plus-aosp am: bcbfb51166 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53f4786e2e13209b72e4993e75c93e9c4fbd5d11
 2021-03-01 23:58:49 +00:00
Steven Ng
65eb127e6f Replace getResourceId default 0 with Resources.ID_NULL 
Test: None

Bug: 181601209
Change-Id: I548947cd4f106baab7428f853cc5342668048476
 2021-03-01 23:40:44 +00:00
Yan Yan
029885f8c7 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I783ea3c7f9ab4b96e15297a8711876388786c81c
 2021-03-01 23:18:00 +00:00
Bob Badour
bcbfb51166 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into rvc-qpr-dev-plus-aosp 2021-03-01 23:17:42 +00:00
Pinyao Ting
4a08dabf99 Merge "Shortcut integration with AppSearch (Part 2)" into sc-dev 2021-03-01 23:10:11 +00:00
Andy Hung
77beac00ba Merge "AudioRecord: Add setLogSessionId" into sc-dev 2021-03-01 23:04:48 +00:00
Lucas Dupin
83b2f37853 Make WallpaperColors hints public 
Per AOSP request, developers would like to access this API, which was
currently marked as @SystemAPI.

Test: atest WallpaperColorsTest
Fixes: 142843776
Change-Id: I3970ab3ce92de78c3f1a994b6bc560518edf626c
 2021-03-01 22:51:22 +00:00
Jing Ji
95ca3989aa Merge "Put stopping service's host process on top of cached process list" into sc-dev 2021-03-01 22:38:27 +00:00
Chris Li
330f99f69b Merge "Allow non-resizable apps in split-screen (5/n)" into sc-dev 2021-03-01 22:33:24 +00:00
Yan Yan
6a6a6349a7 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" 2021-03-01 22:31:24 +00:00
Darryl Johnson
e72cce5235 Merge "Add callbacks for change in supported device states and non-override state." into sc-dev 2021-03-01 22:22:06 +00:00
Kweku Adams
a25f62e2a2 Merge "Fix execution capping." into sc-dev 2021-03-01 21:50:57 +00:00