Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
631,490 Commits 3 Branches 0 Tags
f41fa968d8df0f7001259893fc76d911e99037a7
Commit Graph

631490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f41fa968d8 Merge "Add NEXT accent colors to Theme.DeviceDefault" into sc-dev 2021-03-23 17:37:35 +00:00
TreeHugger Robot
41d74dfea0 Merge "Don't try to report non-existent stats" into sc-dev 2021-03-23 17:34:55 +00:00
Peter Kalauskas
a1a19819d0 Merge "Add metrics for guest user" into sc-dev 2021-03-23 17:30:07 +00:00
Dmitri Plotnikov
f2dca81569 Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev 2021-03-23 17:29:38 +00:00
TreeHugger Robot
fa1cb658a1 Merge "Updated Stretch based on design feedback" into sc-dev 2021-03-23 17:29:35 +00:00
Martijn Coenen
be76c4051b Merge "Make StorageVolume#getOwner a system API." into sc-dev 2021-03-23 17:22:39 +00:00
TreeHugger Robot
3878ef82a2 Merge "Fixup lint errors in ServiceWatcher" into sc-dev 2021-03-23 17:19:15 +00:00
Songchun Fan
cb1cc4f5a9 Merge "[incremental] add incremental info to crash/anr reports in dropbox" into sc-dev 2021-03-23 16:49:53 +00:00
Flavio Fiszman
5785c5c68f Merge "Show messages count in People Tile" into sc-dev 2021-03-23 16:42:53 +00:00
SongFerng Wang
2c691e8dc2 Merge "Changing DEVICE_NR_CAPABILITY type and renaming getMaxActiveInternetData" into sc-dev 2021-03-23 16:41:55 +00:00
Winson Chung
6c246287c7 Don't replace task in list if NEW_TASK + MULTIPLE_TASK is set 
Bug: 183046894
Test: atest RecentTasksTest
Change-Id: Ifbaac51efa90b7a51bd3d64a32dde293ef45d040
 2021-03-23 16:33:42 +00:00
Mustafa Emre Acer
e7ec6b42a9 Merge "Add a new permission for external time sources" into sc-dev 2021-03-23 16:27:46 +00:00
Kweku Adams
31a6954900 Merge "Make sure out-of-quota EJs stop in time." into sc-dev 2021-03-23 16:25:42 +00:00
Mustafa Acer
6cebc2f2ac Add a new permission for external time sources 
This CL adds a new permission called SUGGEST_EXTERNAL_TIME that
gates TimeManager.suggestExternalTime calls.

The new permission is marked as 'privileged' as protection level. This
could result in third party apps preinstalled on the system image to
potentially get this permission. This is OK for the following reasons:
 - OEM coordination is needed to grant 3P apps this permission, so
 adding "privileged" doesn't introduce significant risk.
 - This permission/API doesn't guarantee that the suggested timestamp
 will immediately be used as the new system timestamp. The system must
 be configured so that the external time source has a higher priority
 than other time sources (e.g. GNSS) for the external time suggestion to
 be used. This configuration is also done by the OEM. That introduces
 significant roadblock for a malicious app to do anything useful with
 this permission.
- More importantly, apps can set system time directly using
TimeManager.setTime() which requires SET_TIME permission. This
permission is also signature|privileged, so this change is consistent
with it.

Bug: 157504928, 177079827
CTS-Coverage-Bug: 182275086
Test: atest android.app.time
Change-Id: I0098ab7565b647fb220d39575f0616d2a47bdc89
 2021-03-23 16:24:41 +00:00
Pinyao Ting
934f10e67d Merge "Shortcut integration with AppSearch (Part 6)" into sc-dev 2021-03-23 16:11:16 +00:00
Rambo Wang
8fadaef00c Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 9446a5239f am: 11264381a4 am: ff97f102cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639370

Change-Id: Ib2c5d3ec7b28e37d1fa7426aa9e0a1bc7730b9e8
 2021-03-23 15:57:25 +00:00
Junyu Lai
3753311f9f [automerger skipped] Merge "Remove the reference of new Network(int) in Vpn.java" am: 4e6166801e am: 228f0d9782 am: 6a35ea2e08 -s ours 
am skip reason: skip tag Change-Id I4176dd1298ad8d8e8407eb95b2e6cbb8faf4bc17 with SHA-1 afd9acdb17 is already in history

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

Change-Id: I493bc4996795d605ea72cdbb61617470b0430ffb
 2021-03-23 15:56:44 +00:00
Alex Light
ed271fcf34 Don't try to report non-existent stats 
During OTAPreopt we don't have compilation stats due to the way we
compile things. Don't attempt to report stats in this case since it
will cause an NPE.

Test: manual OTA on a blueline
Bug: 181182967
Bug: 177694884
Change-Id: Ie2eb4d7e2ab562d4436a605bcbdd2ea17517dfc3
 2021-03-23 08:49:13 -07:00
Soonil Nagarkar
33fc2dd635 Fixup lint errors in ServiceWatcher 
Allow subclass equality and use locks appropriately to avoid lint
warnings.

Bug: 181665909
Test: presubmits
Change-Id: I62fe67451fb59f634eb0448edef63e4a28bc476a
 2021-03-23 08:36:23 -07:00
Nate Myren
d6a0393fe0 Merge "Handle proxy chains including the system package" into sc-dev 2021-03-23 15:27:07 +00:00
Lucas Dupin
3f6e3c1c30 Merge "Update share sheet with NEXT style" into sc-dev 2021-03-23 15:20:46 +00:00
Rambo Wang
ff97f102cc Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 9446a5239f am: 11264381a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639370

Change-Id: Ie6b4245a817eb3f8ab0870491ed43d489d72b8a8
 2021-03-23 15:09:36 +00:00
Junyu Lai
6a35ea2e08 Merge "Remove the reference of new Network(int) in Vpn.java" am: 4e6166801e am: 228f0d9782 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649306

Change-Id: I630266baca1280575208216151d03502436cca24
 2021-03-23 15:09:18 +00:00
Kholoud Mohamed
5ee5b490d8 Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" into sc-dev 2021-03-23 15:04:43 +00:00
Rambo Wang
11264381a4 Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 9446a5239f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639370

Change-Id: I15577030238d4e210f1a4f1f31abd937af4adf65
 2021-03-23 14:33:37 +00:00
TreeHugger Robot
9db9a56c7e Merge "Introduce WaveformBuilder to VibrationEffect" into sc-dev 2021-03-23 14:32:56 +00:00
Junyu Lai
228f0d9782 Merge "Remove the reference of new Network(int) in Vpn.java" am: 4e6166801e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649306

Change-Id: If453ebbf3b2ad8f3165196b84e52aadfcd3c7685
 2021-03-23 14:29:51 +00:00
Rambo Wang
9446a5239f Merge "Expose ServiceState#getDataNetworkType in telephony provider" 2021-03-23 14:26:52 +00:00
TreeHugger Robot
699d25c00b Merge "Refactor handling of <Feature Abort> responses" into sc-dev 2021-03-23 14:19:46 +00:00
Martijn Coenen
b329228214 Make StorageVolume#getOwner a system API. 
Since the MediaProvider mainline module will now manage volumes of
multiple users, it needs to know which user a volume belongs to. This
was implemented by an already existing API, so make that a @SystemApi.

Bug: 182396009
Test: N/A

Change-Id: I9ca24e500adfd51fbd52e863f549365dd9aaf39d
 2021-03-23 14:16:12 +00:00
Ying Xu
ab77b87f11 Merge "Update the RAT string for Carrier WiFi" into sc-dev 2021-03-23 14:15:54 +00:00
Jack Nudelman
74230cc4a0 Merge "Require calling package to be allowlisted for thermal mitigation." am: fdad0e26a7 am: d3b14cf1fe am: 6176649cce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634481

Change-Id: I6a3a3d4ebd19e8a2de8fcd3ed054600210e1aa31
 2021-03-23 14:10:49 +00:00
Junyu Lai
e380ff110a [automerger skipped] Merge "Fix cannot find removeUnwantedCapability on R device" am: 5b477acbbe am: ca8859da58 am: cf8c92b0d7 -s ours 
am skip reason: skip tag Change-Id Icf2cda325795acee22a6c634e8d978f64c5ac3cb with SHA-1 ffc922fe2a is already in history

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

Change-Id: I74d0e6ea112c4714c09a12f908fb9273c8477584
 2021-03-23 14:09:59 +00:00
Chiachang Wang
063d3b25fc Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91decf am: 885aad17b5 am: 008ba7a698 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297

Change-Id: I3a99cab2dc0bdaa88a9671e1978c29cb40cd7a5b
 2021-03-23 14:09:30 +00:00
Paul Duffin
1db80b814f Merge "Remove unnecessary dependency on libcore-platform-compat-config" am: 82cd5382b7 am: e70b70a77b am: f083c90ae9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646303

Change-Id: I1c3ed0bb99cb1a61397147f75b752cd921a6cc6d
 2021-03-23 14:06:23 +00:00
Chiachang Wang
fe9ab8ef70 [automerger skipped] Merge "Add NetworkRequest.Builder creating from an existing instance" am: 9327a57876 am: d99881fb33 am: 703fc77437 -s ours 
am skip reason: skip tag Change-Id I068462b2a1410daf67b0c95f2b643d396f079531 with SHA-1 26ab6df3c8 is already in history

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

Change-Id: Icd22cc8edbfbbfe0dc8baecdc966d11c9a43a2ff
 2021-03-23 14:05:23 +00:00
Treehugger Robot
d1afa8af58 [automerger skipped] Merge "Replace hidden API usages of NetworkCapabilities" am: 3972f1c61c am: 8d2198902b am: 0d1c0f6a71 -s ours 
am skip reason: skip tag Change-Id Iaa4e256e43a33bdf08780bdd1a1a8b538058634d with SHA-1 d379cd79c2 is already in history

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

Change-Id: I46c983d9d8901ed7d0efb084ba8a7112b9bea7fe
 2021-03-23 14:05:04 +00:00
Rhed Jao
bdae0d1b77 Merge "Adds OWNERS for servicestests/utils-mockito" am: e1b9b92816 am: 37e30ee198 am: 178e53c6d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645303

Change-Id: Ica59de9939fd5d97078a1bda27d1346e80859362
 2021-03-23 14:04:42 +00:00
Treehugger Robot
47bc18bd45 Merge "Emulator cleanup in ClipboardService.java (closePipe)" am: 43a464cb70 am: 828f46619b am: 5803e055b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634488

Change-Id: Ibb0ffb33f4659bf50b2895834bb6856ef66e0958
 2021-03-23 14:04:19 +00:00
Jing Ji
5ca04e0224 [automerger skipped] Merge "DO NOT MERGE: Don't take the AM lock in cached app compaction handler" into rvc-qpr-dev am: ab365df981 am: d3eb4291f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4016fe82798dabc0c280c95c16481ee57b5312bb
 2021-03-23 14:04:01 +00:00
Jing Ji
c38dec8792 [automerger skipped] DO NOT MERGE: Don't take the AM lock in cached app compaction handler am: 75a4e3f38c am: 740fa9e32b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82c3602ce905e5a7b3a164eff423b68a65384d69
 2021-03-23 14:03:52 +00:00
Tianjie Xu
df6fde66ca Merge changes Ieeb0ebef,I1f33a8c6,I07168a7b am: fb5d22ffea am: 2d2731926f am: 7b349b0d63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1647333

Change-Id: I9d91f3f6b9f8231a96e143dbc3dc2e7d195a56d2
 2021-03-23 14:03:37 +00:00
Junyu Lai
dcca6f6f56 [automerger skipped] Merge "[VCN15] expose addUnwantedCapability and related APIs" am: f38268cd56 am: b894e12344 am: b9be227c46 -s ours 
am skip reason: skip tag Change-Id I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7 with SHA-1 7ff635a9a9 is already in history

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

Change-Id: Id34011ffbdd997f29140b12cae5a0caeae745d3e
 2021-03-23 14:03:13 +00:00
Lorenzo Colitti
52396dad7e Merge "Have a new method in NetworkAgentConfig.Builder to set allowBypass" am: 14f7c0273f am: 07a92ecbd9 am: 702f7447ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649288

Change-Id: Ibc6553b1471ee8e0ab362979ba9525c2e328a275
 2021-03-23 14:02:47 +00:00
Jeff Sharkey
41b860ee63 Merge "Add OWNERS file for content tests." am: 82ac7c4eeb am: 2b047210ff am: 3e41a528f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650090

Change-Id: Ica04999f8b95f5be9706114ce33e5f41879faaac
 2021-03-23 14:02:20 +00:00
Rajeev Kumar
24c97c9f6a Merge "Move disk reads to background" am: 6d7c90717a am: f60e5d331e am: 44b72882b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626341

Change-Id: Id00efc69e73e0376f3508b89cad86f60c77efab0
 2021-03-23 14:01:47 +00:00
Lorenzo Colitti
915460fff3 Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 892589c514 am: 3df38d48ae am: 114c3e3038 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648068

Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94
 2021-03-23 14:01:19 +00:00
Junyu Lai
4e6166801e Merge "Remove the reference of new Network(int) in Vpn.java" 2021-03-23 14:00:35 +00:00
Cody Kesting
a8456883f5 Merge "Cache correct calling UID for VcnStatusCallbacks." am: 7510bf5e99 am: ff05984891 am: d7c4c0cf12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649649

Change-Id: Ifc9c9a6cbbcdc415899b3fee0ce8601e0107aab7
 2021-03-23 14:00:35 +00:00
TreeHugger Robot
86364aaba9 [automerger skipped] Merge "Return copy of pending token list" into rvc-qpr-dev am: 9dce064283 am: bd99a1dc0f -s ours 
am skip reason: skip tag Change-Id I59d159d792a3d9e2a79ea521d6f01a5cb7c65695 with SHA-1 cbe48d9496 is already in history

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

Change-Id: If6eb082433574015e5e61586beb79c657135a153
 2021-03-23 14:00:13 +00:00