Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
416,425 Commits 3 Branches 0 Tags
4932896e244be2edb028552e02374b41e3f7d365
Commit Graph

416425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
4932896e24 Merge "Add validation type definition to support multiple probe result" am: 3bdd969ff7 
am: 4547d8f2db

Change-Id: I743028abffb4fb62fb7c4bfaf74ef864a052fdd7
 2019-04-26 04:00:48 -07:00
Lorenzo Colitti
4547d8f2db Merge "Add validation type definition to support multiple probe result" 
am: 3bdd969ff7

Change-Id: Iad7e1577483bde7e7525943849ec2f91d4d1bfd7
 2019-04-26 03:49:26 -07:00
Lorenzo Colitti
3bdd969ff7 Merge "Add validation type definition to support multiple probe result" 2019-04-26 10:32:19 +00:00
Lorenzo Colitti
30d7a16ddb Merge "Make DNS cache lifecycle management explicit" am: a6d5664819 
am: 57646109fd

Change-Id: I51cf1b7cfd49d4731d922578e8512a1326ebec63
 2019-04-25 17:50:05 -07:00
Svetoslav Ganov
8ebf5c5b6e Merge "Adding API for defining and invoking DirectActions" into qt-dev-plus-aosp 2019-04-26 00:40:31 +00:00
Sunny Goyal
70db79ab0f Adding API for defining and invoking DirectActions 
DirectActions are abstract actions defined by an Activtiy. The
actual definition of these actions will be available through
the support lib.

This API provides a secure channel for system or assistant to
interact with a running app using these Actions.

Test: atest CtsVoiceInteractionTestCases
Test: added android.voiceinteraction.cts.DirectActionsTest

Bug: 129705716

Exempt-From-Owner-Approval: Resolving merge conflict

Change-Id: I0ce568e0d8f41e0fe46306052016a74c7b394efa
(cherry picked from commit d40c345536)
 2019-04-26 00:39:53 +00:00
Lorenzo Colitti
57646109fd Merge "Make DNS cache lifecycle management explicit" 
am: a6d5664819

Change-Id: Ie97fe453c89476915f3b362b6486c7d4608da2a9
 2019-04-25 17:38:23 -07:00
Lorenzo Colitti
a6d5664819 Merge "Make DNS cache lifecycle management explicit" 2019-04-26 00:23:22 +00:00
Pengquan Meng
bf53e7f496 Merge "Fixed the comment of carrier config for CDNR" am: e994a0d66a 
am: 6f7ccba005

Change-Id: I603d8168f425a419d8af261df9b4f732d49459a0
 2019-04-25 15:29:32 -07:00
Pengquan Meng
6f7ccba005 Merge "Fixed the comment of carrier config for CDNR" 
am: e994a0d66a

Change-Id: I33dddc12e64b681e23e5600ab4a1c9cf560f795b
 2019-04-25 15:18:45 -07:00
Pengquan Meng
e994a0d66a Merge "Fixed the comment of carrier config for CDNR" 2019-04-25 22:07:25 +00:00
Pengquan Meng
b4a53fdb9e Fixed the comment of carrier config for CDNR 
Bug: 122921456
Test: build
Merged-In: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
Change-Id: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
(cherry picked from commit 7ac9a8f314)
 2019-04-25 11:23:27 -07:00
Chiachang Wang
f914b77414 Add validation type definition to support multiple probe result 
In order to allow NetworkMonitor to tell ConnectivityService
if the network is either parital, validated or both.
NetworkMonitor could update the probe result by passing the
bitmask to ConnectivityService.

Bug: 130078798
Bug: 130683832
Test: build
Change-Id: I429ccbd9b9afae3eafaf73b3c9eb835213c1f64d
 2019-04-25 16:03:43 +00:00
Arthur Hung
1e05f06908 Merge "Fix PIP window is showing on the lockscreen (1/2)" into qt-dev 
am: 031ec27e64

Change-Id: I2f231fd2be31bf72b9d317da39d017e42798cd56
 2019-04-25 01:23:27 -07:00
Jorim Jaggi
104c86afab Merge "Assign layer to bounds animation layer" into qt-dev 
am: bf8aec37d4

Change-Id: Id3618ed5eb1fa78595c87ae0560f88d51427cb12
 2019-04-25 01:16:07 -07:00
Winson Chung
458bccbda3 Merge "Ensure we get the right nav bar mode for the current user in sysui" into qt-dev 
am: 05500a3651

Change-Id: Id98dba16b731eb62ee5b6e85075733a98092bc85
 2019-04-25 00:59:23 -07:00
Winson Chung
5378135a40 Merge "Manual revert of ag/6502936" into qt-dev 
am: 671a62fffb

Change-Id: I04476647c7b16b61d83ed98b0cbc56b8b7fe7f4b
 2019-04-25 00:39:50 -07:00
TreeHugger Robot
031ec27e64 Merge "Fix PIP window is showing on the lockscreen (1/2)" into qt-dev 2019-04-25 07:25:13 +00:00
Linda Tseng
4dd4a639c0 Merge "Add night variant of Theme.DeviceDefault.Settings.Dialog" into qt-dev 
am: 4d304d67b8

Change-Id: I53dabe19a330e6f0bdd23e1873a5a2f0afcc8fa4
 2019-04-25 00:06:58 -07:00
Jorim Jaggi
bf8aec37d4 Merge "Assign layer to bounds animation layer" into qt-dev 2019-04-25 06:39:53 +00:00
Jack He
2c16f7e759 Merge "Bluetooth: Remove safetynet logging for 120574260" into qt-dev 
am: 4ab647f501

Change-Id: I2fd055fcacce08994ea067f0a7aa81c5cdd5e51b
 2019-04-24 23:23:29 -07:00
Winson Chung
05500a3651 Merge "Ensure we get the right nav bar mode for the current user in sysui" into qt-dev 2019-04-25 06:14:57 +00:00
Lorenzo Colitti
af3e5679cf [automerger skipped] Merge changes from topic "niap-vpn" into qt-dev 
am: 067b9dc406 -s ours
am skip reason: change_id Ic2faef44831575b2d03bc00ef2553d5c549adc95 with SHA1 4469b1d8a5 is in history

Change-Id: I4775263c2f422a9738812b02be61e2af95e9c472
 2019-04-24 23:02:31 -07:00
Winson Chung
671a62fffb Merge "Manual revert of ag/6502936" into qt-dev 2019-04-25 05:52:07 +00:00
Linda Tseng
4d304d67b8 Merge "Add night variant of Theme.DeviceDefault.Settings.Dialog" into qt-dev 2019-04-25 05:51:19 +00:00
Riddle Hsu
57805e1a6e Merge "Resolve size compatibility bounds by original display attributes" into qt-dev 
am: 7c94df4903

Change-Id: Ic5c9be66304c6795b69f3f93251d8b22a300e648
 2019-04-24 22:44:19 -07:00
TreeHugger Robot
4ab647f501 Merge "Bluetooth: Remove safetynet logging for 120574260" into qt-dev 2019-04-25 05:37:05 +00:00
Lorenzo Colitti
e894b51d25 [automerger skipped] Merge "Make the network stack a persistent process." into qt-dev 
am: 42a5a8deec -s ours
am skip reason: change_id Ic8ebf6356e23489f6cd984d680ff9f1b4cbbe52d with SHA1 796afddd6c is in history

Change-Id: Idbc7ee03b81bd20455dd7c33ef4e8d588d7cef54
 2019-04-24 22:19:24 -07:00
Chiachang Wang
0f8f2b7934 [automerger skipped] Merge "Remove Settings constants for NetworkStack" am: d32d766a04 
am: a4527d568f -s ours
am skip reason: change_id I7291cfa86cd6e907df35e8fbc97e2e9a77e56cab with SHA1 3429aac7ab is in history

Change-Id: I44109a0f0cd05940ef9f887f8e3b5906ad92bc1a
 2019-04-24 22:16:27 -07:00
Chiachang Wang
a4527d568f Merge "Remove Settings constants for NetworkStack" 
am: d32d766a04

Change-Id: Icba412d89c10a64d7e5d3d396b6a1364f7ad6bc5
 2019-04-24 22:05:10 -07:00
Kevin Chyn
ff8cfea871 Merge "Do not dismiss BiometricPrompt when "soft" errors are received" into qt-dev 
am: d9919f2750

Change-Id: I9264ad365a7f7165941688e95181e873d82090d4
 2019-04-24 21:57:37 -07:00
Chiachang Wang
d32d766a04 Merge "Remove Settings constants for NetworkStack" 2019-04-25 04:49:04 +00:00
Android Build Merger (Role)
a3c49e2db7 Merge "Merge "Position "At a Glance" on custom clock below status bar." into qt-dev am: b24641b2a8" into qt-dev-plus-aosp 2019-04-25 04:35:30 +00:00
Robert Snoeberger
d63ae56f0c Merge "Position "At a Glance" on custom clock below status bar." into qt-dev 
am: b24641b2a8

Change-Id: Ic67c715f2ec3613c446e7a0877ab0ca75519a8d9
 2019-04-24 21:34:59 -07:00
Chiachang Wang
44fdc7c48c Merge "Update exception type thrown when NetworkStack is missing" am: fb60c85219 
am: ed6bc570af

Change-Id: I67005a5384888e8acaf1249af79484e2d5ed6f1f
 2019-04-24 21:31:21 -07:00
Lorenzo Colitti
067b9dc406 Merge changes from topic "niap-vpn" into qt-dev 
* changes:
  Reinstate new VPN uid filtering unit tests
  Revert new tests and PackageManager mock
  Block incoming non-VPN packets to apps under fully-routed VPN
 2019-04-25 04:23:01 +00:00
Chiachang Wang
ed6bc570af Merge "Update exception type thrown when NetworkStack is missing" 
am: fb60c85219

Change-Id: Icbf7db83d73a1912573e71c71f694f2d37d788af
 2019-04-24 21:19:45 -07:00
TreeHugger Robot
7c94df4903 Merge "Resolve size compatibility bounds by original display attributes" into qt-dev 2019-04-25 04:17:33 +00:00
Sudheer Shanka
d5099b1df5 Fix QT build breakage. 
am: ebcf054b48

Change-Id: I02eb972b91df8e87403b308968dcd96fa4bf9fe7
 2019-04-24 21:12:23 -07:00
Lorenzo Colitti
42a5a8deec Merge "Make the network stack a persistent process." into qt-dev 2019-04-25 03:53:41 +00:00
Chiachang Wang
fb60c85219 Merge "Update exception type thrown when NetworkStack is missing" 2019-04-25 03:48:52 +00:00
Sudheer Shanka
0fe94f264a Merge "Update behavior of some DownloadManager APIs." into qt-dev 
am: cbfe50d70c

Change-Id: Ib6f9296dd94bdeae9a470a769e4505aa8b6df5b0
 2019-04-24 20:40:19 -07:00
Anil Admal
6e9ed89285 Merge "Pass responseType in NFW notification callback to the framework" into qt-dev 
am: 471ddb2bd9

Change-Id: Ib9026bf0c9fb2091a5d8b03ed6d40ecd3fdb2dba
 2019-04-24 20:32:53 -07:00
Greg Daniel
fd554ed0ad Merge "Fix deletion of VkSemaphores in VulkanManager." into qt-dev 
am: f58e51b4e3

Change-Id: I446007f727417f93ad65366d2b22dfe4094ff892
 2019-04-24 20:27:39 -07:00
Jack He
69450753ac Bluetooth: Remove safetynet logging for 120574260 
Bug: 120574260
Test: make
Change-Id: Id86c139e654428f8d4376f2d0359329e47c052b9
 2019-04-25 03:22:42 +00:00
Julia Reynolds
470b5714e3 Merge "Update appearance of proxied notifications in guts" into qt-dev 
am: 154862c985

Change-Id: I10cc048b6dad01b4b2af7feef213acd3cc2ee03a
 2019-04-24 20:22:35 -07:00
Kevin Chyn
d9919f2750 Merge "Do not dismiss BiometricPrompt when "soft" errors are received" into qt-dev 2019-04-25 03:20:30 +00:00
Sunny Goyal
97abd895b1 Merge "Exposing some accessibility methods and state to be used in Launcher" into qt-dev 
am: 389b4d9033

Change-Id: Ic124f387ba43f08b1a644be090cc02a73025d80c
 2019-04-24 20:17:25 -07:00
Hyunyoung Song
56062ce295 Merge "Consistently log back gesture origin" into qt-dev 
am: 5b1af7e1e3

Change-Id: Ic6fce7c13769367b808a9facb1b2a74837d720e6
 2019-04-24 20:12:16 -07:00
Mike Digman
b876f8389d Merge "Sharesheet - add label loading placeholder" into qt-dev 
am: b6e9673bd4

Change-Id: Ic4e48bd2a26fd72ae43c59b80f9dc8dee6cca46e
 2019-04-24 19:48:56 -07:00