Christian Wailes
8645b7d3db
Merge "Adds additional sanitization for Zygote command arguments."
2019-04-25 21:02:49 +00:00
Chris Wailes
c99198249f
Adds additional sanitization for Zygote command arguments.
...
Previously we were only insuring that the arguments provided to the
Zygote didn't contain any newlines. This adds additional checks for
carriage returns and standalone integer arguments to protect against
malicious argument and packet injection respectively.
Bug: 130164289
Test: m & flash & boot & check logs
Change-Id: I4055c50d52db0047c02c11096710fd07b429660c
2019-04-25 21:02:15 +00:00
Christian Wailes
c2a1b3f4bc
Merge "Change USAP name to application name as soon as possible."
2019-04-25 18:32:10 +00:00
Beth Thibodeau
a8cb6e110c
Merge "Fix null pointer exceptions"
2019-04-25 14:11:41 +00:00
Al Sutton
9b6ae901eb
Re-add the logging to track when a backup transport is used which hasn't been initialised.
...
Test: atest RunBackupFrameworksServicesRoboTests
Fixes: 110781477
Change-Id: I8645fb4eab24dc531b93e865003d894dc1877d99
2019-04-25 13:25:31 +01:00
Arthur Hung
b7380d16a1
Merge "Fix PIP window is showing on the lockscreen (1/2)" into qt-dev am: 031ec27e64
...
am: 1e05f06908
Change-Id: I935898913dbb031b50230a1e83ca0ac17064d29a
2019-04-25 01:40:00 -07:00
Jorim Jaggi
cacc9f90a5
Merge "Assign layer to bounds animation layer" into qt-dev am: bf8aec37d4
...
am: 104c86afab
Change-Id: I8abf01a65af8b79e6629d2df5397ebc4b73493f9
2019-04-25 01:25:54 -07: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
a32aaf794b
Merge "Ensure we get the right nav bar mode for the current user in sysui" into qt-dev am: 05500a3651
...
am: 458bccbda3
Change-Id: Icabe683a3220bb94d0e74b0632392b87f4ade3c6
2019-04-25 01:11:50 -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
f6395e07d3
Merge "Manual revert of ag/6502936" into qt-dev am: 671a62fffb
...
am: 5378135a40
Change-Id: Id4ce3977f0e48e7d9692afd21c8563f93106a2e8
2019-04-25 00:51:01 -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
Linda Tseng
13d4f1430f
Merge "Add night variant of Theme.DeviceDefault.Settings.Dialog" into qt-dev am: 4d304d67b8
...
am: 4dd4a639c0
Change-Id: I65f40ef698802b212900ac7797df9ab0437bbdfd
2019-04-25 00:29:57 -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
Jack He
6615d306ba
Merge "Bluetooth: Remove safetynet logging for 120574260" into qt-dev am: 4ab647f501
...
am: 2c16f7e759
Change-Id: I85c853bc590dfdc6d8f3093231a9258199f4b4d7
2019-04-24 23:42:36 -07:00
Jorim Jaggi
bf8aec37d4
Merge "Assign layer to bounds animation layer" into qt-dev
2019-04-25 06:39:53 +00:00
Lorenzo Colitti
37be2e8181
[automerger skipped] Merge changes from topic "niap-vpn" into qt-dev am: 067b9dc406 -s ours
...
am: af3e5679cf -s ours
am skip reason: change_id Ic2faef44831575b2d03bc00ef2553d5c549adc95 with SHA1 4469b1d8a5 is in history
Change-Id: I5ff169bc9e974665a034a0a46c853ee10cfb9d1b
2019-04-24 23:35:58 -07:00
Riddle Hsu
c2c11fb72c
Merge "Resolve size compatibility bounds by original display attributes" into qt-dev am: 7c94df4903
...
am: 57805e1a6e
Change-Id: I38e444d2a9ae7c9347aead9385bbd3de5e66cab6
2019-04-24 23:25:09 -07: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
Lorenzo Colitti
db2fea0eb1
[automerger skipped] Merge "Make the network stack a persistent process." into qt-dev am: 42a5a8deec -s ours
...
am: e894b51d25 -s ours
am skip reason: change_id Ic8ebf6356e23489f6cd984d680ff9f1b4cbbe52d with SHA1 796afddd6c is in history
Change-Id: Ifede3708f43ec88fcfbcee678d85daeacf368724
2019-04-24 23:19:31 -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
Chiachang Wang
4c0f0cf767
[automerger skipped] Merge "Remove Settings constants for NetworkStack" am: d32d766a04 am: a4527d568f -s ours
...
am: 0f8f2b7934 -s ours
am skip reason: change_id I7291cfa86cd6e907df35e8fbc97e2e9a77e56cab with SHA1 3429aac7ab is in history
Change-Id: I3179e849df6a4085b8d0bce03cda133276ecbeae
2019-04-24 23:12:28 -07: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
Kevin Chyn
acc1863068
Merge "Do not dismiss BiometricPrompt when "soft" errors are received" into qt-dev am: d9919f2750
...
am: ff8cfea871
Change-Id: I1ca17005e793790e70b531f383de9160cb6c6a9d
2019-04-24 22:56:23 -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
Robert Snoeberger
06bfe040ad
Merge "Merge "Position "At a Glance" on custom clock below status bar." into qt-dev am: b24641b2a8" into qt-dev-plus-aosp
...
am: a3c49e2db7
Change-Id: I73dcda148ae6b95fe6726c807b2ddbbb499dc01c
2019-04-24 22:50:42 -07: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
Chiachang Wang
7f581219e1
Merge "Update exception type thrown when NetworkStack is missing" am: fb60c85219 am: ed6bc570af
...
am: 44fdc7c48c
Change-Id: Ic1766e839f8f06b539d5f6cfecd29547021fd1d9
2019-04-24 22:35:58 -07:00
Sudheer Shanka
7ee7d7d0f0
Fix QT build breakage. am: ebcf054b48
...
am: d5099b1df5
Change-Id: I40b0dc1fea8fd082eb8ac084fe80beb9f0742d0f
2019-04-24 22:25:45 -07: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
Sudheer Shanka
bbc9133e43
Merge "Update behavior of some DownloadManager APIs." into qt-dev am: cbfe50d70c
...
am: 0fe94f264a
Change-Id: I048976c5836c097387a58cc1d661e4cc6c3cb8fb
2019-04-24 22:12:54 -07:00
Anil Admal
05ca2737d0
Merge "Pass responseType in NFW notification callback to the framework" into qt-dev am: 471ddb2bd9
...
am: 6e9ed89285
Change-Id: I1d550c95997aaacd6e993546f165a857f5faf018
2019-04-24 22:06:47 -07:00
Chiachang Wang
a4527d568f
Merge "Remove Settings constants for NetworkStack"
...
am: d32d766a04
Change-Id: Icba412d89c10a64d7e5d3d396b6a1364f7ad6bc5
2019-04-24 22:05:10 -07:00
Greg Daniel
51692ad9f5
Merge "Fix deletion of VkSemaphores in VulkanManager." into qt-dev am: f58e51b4e3
...
am: fd554ed0ad
Change-Id: Ie7f5a9542a44aebb56661e86f1247f44886f5a10
2019-04-24 22:01:34 -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
Julia Reynolds
1947ffb79e
Merge "Update appearance of proxied notifications in guts" into qt-dev am: 154862c985
...
am: 470b5714e3
Change-Id: I2bffce3e0f5c727ac6e66244344ea189d5efe2b6
2019-04-24 21:56:33 -07:00
Sunny Goyal
141bf4ae53
Merge "Exposing some accessibility methods and state to be used in Launcher" into qt-dev am: 389b4d9033
...
am: 97abd895b1
Change-Id: Id49887900d4b616ec3c6fde71831e7aefff2ac0b
2019-04-24 21:51:32 -07:00
Chiachang Wang
d32d766a04
Merge "Remove Settings constants for NetworkStack"
2019-04-25 04:49:04 +00:00
Hyunyoung Song
283df757c8
Merge "Consistently log back gesture origin" into qt-dev am: 5b1af7e1e3
...
am: 56062ce295
Change-Id: I1a28610204604c15e9e7a9418bbc6cc273ee6caf
2019-04-24 21:46:37 -07:00
Mike Digman
d12d4e870c
Merge "Sharesheet - add label loading placeholder" into qt-dev am: b6e9673bd4
...
am: b876f8389d
Change-Id: Ic60448dd3163c056b043a4342f2426ae88c26efc
2019-04-24 21:41:45 -07: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
Lorenzo Colitti
0f911324b0
Merge "Merge "Add privapp permissions to network modules." am: f11bd352b4 am: bfac8ddcc5" into qt-dev-plus-aosp
...
am: 505c2abaea
Change-Id: I89d4198d6c1ff3d5fcc72ea8b18b7ece8fca83e2
2019-04-24 21:22:31 -07:00