Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
402,320 Commits 3 Branches 0 Tags
66a1ecb7292df6dc8aeb5fe9abeb5e4e36790ea2
Commit Graph

402320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ecco Park
66a1ecb729 Merge "add eap_method and phase2_method string in enterpriseConfig for dump" 2019-01-30 15:50:05 +00:00
TreeHugger Robot
0100a38344 Merge "Removed reserverd proto number." 2019-01-30 15:30:41 +00:00
TreeHugger Robot
5e5aebe9f6 Merge "Remove CHOOSER_UI intent filter." 2019-01-30 15:24:40 +00:00
Remi NGUYEN VAN
a8f471c007 Merge "Add SystemApi for captive portal metrics" 2019-01-30 15:19:07 +00:00
Annie Meng
9778ed5c0d Merge "[Multi-user] Properly check for system apps in multi-user context" 2019-01-30 14:45:16 +00:00
Greg Daniel
d8e7d56cdf Merge "Update Vulkan skia creation to use apiVersion instead of instanceVersion" 2019-01-30 14:24:36 +00:00
TreeHugger Robot
06f12cba1c Merge "Input devices configure on per-display basis (2/2)" 2019-01-30 14:04:59 +00:00
Yueming Wang
17af4f0050 Merge "Update startViewCalendarEventInManagedProfile API according to API review" 2019-01-30 13:44:49 +00:00
Julia Reynolds
3b54a6043a Merge "Add a setting for hiding silent status icons" 2019-01-30 13:41:08 +00:00
Remi NGUYEN VAN
d4a9de2055 Add SystemApi for captive portal metrics 
The metrics go through NetworkMonitor in the NetworkStack so that they
can be upgraded to new metrics in the future.

Test: flashed, captive portal login works, metrics shown in events log
Bug: 112869080
(Cherry-pick of aosp/890004)

Change-Id: I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8
 2019-01-30 22:01:20 +09:00
Matt Pietal
ffcf6e5460 Merge "Sharesheet content preview - adding text support only" 2019-01-30 11:58:51 +00:00
TreeHugger Robot
3186185050 Merge "Made ContentCapture's UserDataRemovalRequest getters public." 2019-01-30 11:32:37 +00:00
Misha Wagner
5222946e1e Merge "Add more statistics on failure cases for value metrics" 2019-01-30 11:31:39 +00:00
Neil Fuller
131f0814f3 [automerger skipped] Merge "Track ZygoteHooks API changes in libcore" am: 20bca262f5 am: 97ba02c505 
am: 6bdf43af58 -s ours
am skip reason: change_id Ie65aac6539cffc90663807791511b95a6cd61ab4 with SHA1 555d8b7eca is in history

Change-Id: Ib4983fe157f2a7dc7dfd9c052e44262d34479ec8
 2019-01-30 03:29:43 -08:00
Neil Fuller
6bdf43af58 Merge "Track ZygoteHooks API changes in libcore" am: 20bca262f5 
am: 97ba02c505

Change-Id: I3b377b6bd83cf6d7d293c89931ac13560e9db2c7
 2019-01-30 03:19:42 -08:00
Neil Fuller
97ba02c505 Merge "Track ZygoteHooks API changes in libcore" 
am: 20bca262f5

Change-Id: I9245629f0a5ba6fed9695f591396747eb1ae911c
 2019-01-30 03:10:21 -08:00
Oscar Shu
aaf9b88835 Merge "Revert "Wifi MAC Randomization: Developer option change global settings"" 2019-01-30 10:55:34 +00:00
Neil Fuller
20bca262f5 Merge "Track ZygoteHooks API changes in libcore" 2019-01-30 10:53:55 +00:00
Android Build Merger (Role)
17c5c14f38 Merge changes from topic "am-abce5681da074e3fa5a9a6b85cf6ce68" 
* changes:
  [automerger skipped] Merge "API: Fix missing @NonNull annotations" am: b852f6636f am: d1f5939c1a am: 5918a1cb6b -s ours am skip reason: change_id Ia7589dfcc7f63923890e609dbf03175d2b035d29 with SHA1 918c4f1043 is in history
  Merge "API: Add missing nullability annotations" am: e148fbcf03 am: 336e11018e am: aaeb5c1201
 2019-01-30 10:39:45 +00:00
Hyundo Moon
0cc58077bb Merge "Move Rating and MediaDescription into mainline module" 2019-01-30 10:38:09 +00:00
Adrian Roos
38354f9fea [automerger skipped] Merge "API: Fix missing @NonNull annotations" am: b852f6636f am: d1f5939c1a 
am: 5918a1cb6b -s ours
am skip reason: change_id Ia7589dfcc7f63923890e609dbf03175d2b035d29 with SHA1 918c4f1043 is in history

Change-Id: I7ea06e3270f84d3883113a8a1babfe1608e9c903
 2019-01-30 02:37:56 -08:00
Tiger Huang
54caefd531 Merge "Let the activity embedded in ActivityView can be directly touched" 2019-01-30 10:36:02 +00:00
Adrian Roos
68a993b75b Merge "API: Add missing nullability annotations" am: e148fbcf03 am: 336e11018e 
am: aaeb5c1201

Change-Id: I0fdde8f76a00a9f019629a71de4a78fb790176d4
 2019-01-30 02:31:31 -08:00
Richard Uhler
8ffae36fa9 Merge "Rename RollbackInfo.getSessionId to getCommittedSessionId." 2019-01-30 10:29:04 +00:00
Stanislav Zholnin
5059dae031 Merge "Adding permission to use DeviceConfig API for AssistantSettings notification service. Permission check will be enforced later." 2019-01-30 10:19:13 +00:00
Adrian Roos
5918a1cb6b Merge "API: Fix missing @NonNull annotations" am: b852f6636f 
am: d1f5939c1a

Change-Id: I3d0ac8768dcc9c314e235dc679752dd5cbfde0c5
 2019-01-30 02:17:56 -08:00
Narayan Kamath
a3bf162ae4 Merge "Multi-user support for app data snapshot / rollback." 2019-01-30 10:15:33 +00:00
Zimuzo Ezeozue
aab0a275ae Merge "Notify PackageHealthObservers of the package versionCode on package failure" 2019-01-30 10:13:41 +00:00
Adrian Roos
aaeb5c1201 Merge "API: Add missing nullability annotations" am: e148fbcf03 
am: 336e11018e

Change-Id: Idb6cbb94968f4a2ffe3055291f23fc903fe923a0
 2019-01-30 02:12:37 -08:00
Adrian Roos
d1f5939c1a Merge "API: Fix missing @NonNull annotations" 
am: b852f6636f

Change-Id: Id6451f9cd18debf51137a81159ead79064fbafca
 2019-01-30 01:55:30 -08:00
Adrian Roos
336e11018e Merge "API: Add missing nullability annotations" 
am: e148fbcf03

Change-Id: I6b092f370a8b2eba20d19c6e43b4e5f5b217af16
 2019-01-30 01:51:31 -08:00
Narayan Kamath
d8a9470db5 Merge "PackageManagerShellCommand: Add command to initiate a rollback." 2019-01-30 09:43:24 +00:00
Adrian Roos
b852f6636f Merge "API: Fix missing @NonNull annotations" 2019-01-30 09:31:58 +00:00
Adrian Roos
e148fbcf03 Merge "API: Add missing nullability annotations" 2019-01-30 09:31:58 +00:00
Felipe Leme
6f6bdae72d Made ContentCapture's UserDataRemovalRequest getters public. 
Test: m update-api
Test: atest CtsContentCaptureServiceTestCases

Fixes: 123597549

Change-Id: Ibb35f860e97bb4b7f6aa564a7b2cfccbc9e041d4
 2019-01-30 01:08:23 -08:00
Rhed Jao
098876f547 Merge "Improve clear a11y forcus for A11yManagerService" 2019-01-30 08:01:13 +00:00
Martijn Coenen
20f1a5d3ab Merge "Allow app zygote to keep APK / shared libs open across fork." 2019-01-30 07:59:01 +00:00
Chen Xu
ac07db1685 Merge "move ServiceState.getDataRegState to greylist" am: 607e797932 am: 43640ec075 
am: 94660fa63f

Change-Id: I83b299fc31a3a76ea0489588c0a44205825d5e28
 2019-01-29 23:04:25 -08:00
Android Build Merger (Role)
578597817c Merge "[automerger skipped] Merge "Add APIs to get/set if usage of multiple SIMs is restricted." am: 59133875e7 am: e01966e89b am: adb7ee97e4 -s ours am skip reason: change_id I5e3e5ff41927e43ead4a30988630cf9125d5a048 with SHA1 398d5d9113 is in history" 2019-01-30 06:53:19 +00:00
Michele Berionne
e446276db4 [automerger skipped] Merge "Add APIs to get/set if usage of multiple SIMs is restricted." am: 59133875e7 am: e01966e89b 
am: adb7ee97e4 -s ours
am skip reason: change_id I5e3e5ff41927e43ead4a30988630cf9125d5a048 with SHA1 398d5d9113 is in history

Change-Id: I4f032c13c3a44a48431a7da437a20c9a1a9ecc8a
 2019-01-29 22:51:49 -08:00
Mathieu Chartier
9f52d0a133 Merge "Add gctype device config property for GC experiments" 2019-01-30 06:50:28 +00:00
Chen Xu
94660fa63f Merge "move ServiceState.getDataRegState to greylist" am: 607e797932 
am: 43640ec075

Change-Id: Icf40ec83d25ec8057429e3b142fea6506f2ebe40
 2019-01-29 22:49:57 -08:00
Arthur Hung
82bbfc399f Input devices configure on per-display basis (2/2) 
While computing the new configuration values based on
display info and input devices, some input devices may be
associated with a specific display.
This patch would apply the right corresponding config from the input
devices which are associated with current display or no associated.

The virtual display will still follow default display.

Bug: 116767202
Test: atest WindowConfigurationTests
Test: atest inputflinger_tests
Test: atest ActivityManagerMultiDisplayTests
Change-Id: I1dbd6e07ab81b5018be7bdb8c71dd44f2036eb4a
 2019-01-30 14:44:33 +08:00
Michele Berionne
adb7ee97e4 Merge "Add APIs to get/set if usage of multiple SIMs is restricted." am: 59133875e7 
am: e01966e89b

Change-Id: I383b701bff4c77596fad1d72929a5afcc5b0cf56
 2019-01-29 22:42:29 -08:00
Chalard Jean
08577fc579 Tell the factory it is already serving a request. 
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.

Gives each factory a serial number and propogates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.

Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.

This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.

Bug: 18637384
Bug: 29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e
 2019-01-30 15:41:57 +09:00
Chen Xu
43640ec075 Merge "move ServiceState.getDataRegState to greylist" 
am: 607e797932

Change-Id: I7d63f204bb34e462039d3889d1876b3264d0f567
 2019-01-29 22:37:01 -08:00
Michele Berionne
e01966e89b Merge "Add APIs to get/set if usage of multiple SIMs is restricted." 
am: 59133875e7

Change-Id: Ie9c2a17b65f21862502056957ff5603b62f7d4dd
 2019-01-29 22:31:18 -08:00
Chen Xu
607e797932 Merge "move ServiceState.getDataRegState to greylist" 2019-01-30 06:20:01 +00:00
Michele Berionne
59133875e7 Merge "Add APIs to get/set if usage of multiple SIMs is restricted." 2019-01-30 06:18:19 +00:00
Mathieu Chartier
41c6a0ad9c Merge "Disable presubmit test until it works with disabled iorap by default" 2019-01-30 06:12:31 +00:00