Commit Graph

464989 Commits

Author SHA1 Message Date
Matt Pape
71b8672f40 Merge "Respect forceNonSystemPackage param when creating new Setting objects." 2020-02-05 20:30:12 +00:00
Automerger Merge Worker
4f552dc3bd [automerger skipped] Merge changes from topics "cbs_area_info", "subscription_id" am: 361cae3630 am: 3f01e13713 am: a74cbceda1 -s ours
am skip reason: Change-Id I5995e3c5099a1e49cb0c54d33da1dbfcc94d4037 with SHA-1 afaa71d418 is in history

Change-Id: I79aa8395663734ade4dd7856158a4863e5de087b
2020-02-05 19:48:50 +00:00
Automerger Merge Worker
91bdee5214 [automerger skipped] Renamed SUB_ID to SUBSCRIPTION_ID am: 087568092a am: 8a6bd20bdb am: a18c5c0266 -s ours
am skip reason: Change-Id Iac8d9abe3b011485ffe8220d94f25f99d022014b with SHA-1 e94a7a4f97 is in history

Change-Id: Iba2bf0afa23cc1468ab776a172c2b14a9326aebd
2020-02-05 19:48:45 +00:00
Automerger Merge Worker
a977b7d4e1 Merge "DSU to support GSI key revocation list" am: 739c45ea23 am: 0fc353ce55 am: 7896578eb8
Change-Id: Id142f630633c882336b6212313de4946a8c1f59f
2020-02-05 19:47:53 +00:00
Automerger Merge Worker
a74cbceda1 Merge changes from topics "cbs_area_info", "subscription_id" am: 361cae3630 am: 3f01e13713
Change-Id: I90ead187a39bf79e66c93184066bd467ef291d71
2020-02-05 19:27:35 +00:00
Automerger Merge Worker
a18c5c0266 Renamed SUB_ID to SUBSCRIPTION_ID am: 087568092a am: 8a6bd20bdb
Change-Id: I5ad401812d99944597f54b5d9647e7976eb5aa8c
2020-02-05 19:27:32 +00:00
Automerger Merge Worker
7896578eb8 Merge "DSU to support GSI key revocation list" am: 739c45ea23 am: 0fc353ce55
Change-Id: Ib864db358cb0eea9faf839ead88b8e9fbe38f85a
2020-02-05 19:26:46 +00:00
TreeHugger Robot
929de64796 Merge "Set secure window flag for AuthContainerView" 2020-02-05 19:25:08 +00:00
Automerger Merge Worker
3f01e13713 Merge changes from topics "cbs_area_info", "subscription_id" am: 361cae3630
Change-Id: I95de805e4f8decbba7ab5f18278d97a13d064eb9
2020-02-05 19:19:33 +00:00
Automerger Merge Worker
8a6bd20bdb Renamed SUB_ID to SUBSCRIPTION_ID am: 087568092a
Change-Id: I3c5f995f742ea861140e22ab43ff40d89ab462ad
2020-02-05 19:19:27 +00:00
TreeHugger Robot
d27eec1829 Merge "Update StatsLogProcessor to handle BinaryPushStateChanged" 2020-02-05 19:15:29 +00:00
Jack Yu
361cae3630 Merge changes from topics "cbs_area_info", "subscription_id"
* changes:
  Added area info support in cell broadcast service
  Renamed SUB_ID to SUBSCRIPTION_ID
2020-02-05 19:13:54 +00:00
Automerger Merge Worker
0fc353ce55 Merge "DSU to support GSI key revocation list" am: 739c45ea23
Change-Id: Ie2fd14d1fe4029a2c8178c36630167cea0e65af5
2020-02-05 19:12:37 +00:00
TreeHugger Robot
795821c578 Merge "Set defaults for cached and empty processes." 2020-02-05 19:02:41 +00:00
Yo Chiang
739c45ea23 Merge "DSU to support GSI key revocation list" 2020-02-05 19:01:54 +00:00
Pavel Grafov
698008d24a Merge "Mark tests as flaky to exclude from presubmit." 2020-02-05 18:57:54 +00:00
Hui Yu
ddd7be3a66 Merge "Flag for FGS bg start default value should be true." 2020-02-05 18:52:46 +00:00
Svetoslav Ganov
2dccbf2d60 Merge "Scrollable inline keyboard suggestions" 2020-02-05 18:52:35 +00:00
Jerome Gaillard
a39b118fc0 Merge changes I55c997d2,I3f9dc5af,I9c676aa1
* changes:
  Remove debug printf from LayoutlibLoader.
  Compile more jni classes for host
  Build more native code for Windows
2020-02-05 18:51:31 +00:00
Pavel Grafov
e380b4cff0 Mark tests as flaky to exclude from presubmit.
Bug: 148934649
Test: compiles
Change-Id: Ifc85a06fdea35bc13096f38da6564e5590a05e8f
2020-02-05 18:42:15 +00:00
Cody Kesting
394b62bc8c Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." 2020-02-05 18:31:32 +00:00
Cody Kesting
c79ad374a5 Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." 2020-02-05 18:30:20 +00:00
Howard Ro
1f0c52287b Merge "Update libstatssocket/pull API council feedback" 2020-02-05 18:28:12 +00:00
David Su
8a6f7056c2 Merge "Register RttManager correctly" 2020-02-05 18:25:56 +00:00
David Su
41bb9862d8 Merge "WifiConfiguration: unmark apBand as @SystemApi" 2020-02-05 18:24:01 +00:00
TreeHugger Robot
1527beb31e Merge "Add public docs to AppOpsManager" 2020-02-05 18:07:42 +00:00
Julia Reynolds
f23b307b40 Merge "Protect against server crashes" 2020-02-05 18:05:29 +00:00
Christine Tsai
82249e8fba Merge "Deprecate WifiRunningStateChanged atom" 2020-02-05 18:03:29 +00:00
TreeHugger Robot
96c5346bb8 Merge "Protect against bad uris" 2020-02-05 18:03:18 +00:00
Automerger Merge Worker
111f0aea25 Merge "Correct a permission check / add a test" am: 05cf3e896c am: 04be13bb01 am: c58c250192
Change-Id: Iccd71c383788a21f12374d805cacbb3ff5b02771
2020-02-05 17:47:27 +00:00
Eric Laurent
bb254e06ca Merge "AudioService: add restriction on audio mode selection" 2020-02-05 17:41:43 +00:00
Matt Pape
d3748577b6 Respect forceNonSystemPackage param when creating new Setting objects.
Previously, new settings created via DeviceConfig.setProperty() resulted
in the forceNonSystemPackage param being ignored and the makeDefault
param being overwritten to true. This caused new Setting objects added
this way to always save their initial value as the default value. This
caused problems in tests that tried to make local changes and later
reset them to the prior state.

Test: atest FrameworksCoreTests:DeviceConfigTest
Bug: 147862338
Change-Id: I98a4585fc39cb8c39e630c0dcd318b05a085fcc3
2020-02-05 09:38:32 -08:00
Jing Ji
96517fc5ed Merge "Fix CTS failure ActivityManagerTest.testKillingPidsOnImperceptible" 2020-02-05 17:36:54 +00:00
Brett Chabot
9923f37845 Remove debug printf from LayoutlibLoader.
The output is confusing the simulated device result parser.

Test: tools/test/simulated_device/run_all_tests_host.sh
Change-Id: I55c997d2f07ec50c11485d27e1918484c8eb7e5a
2020-02-05 17:32:28 +00:00
Automerger Merge Worker
c58c250192 Merge "Correct a permission check / add a test" am: 05cf3e896c am: 04be13bb01
Change-Id: I88b7d0c0dfa563debe1dda88649d7fb0f43155df
2020-02-05 17:31:35 +00:00
Jerome Gaillard
0e4893bb3a Compile more jni classes for host
This adds android_text_AndroidCharacter.cpp and
android_view_RenderNodeAnimator.cpp to the list of classes compiled for
host target.

Bug: 117921091
Test: lunch sdk && m libandroid_runtime
Change-Id: I3f9dc5af4ecf5ae4b6f336a5c95d043222f72c38
2020-02-05 17:30:53 +00:00
Jerome Gaillard
84d3814981 Build more native code for Windows
Build android_os_Trace.cpp, android_util_StringBlock.cpp and
android_util_XmlBlock.cpp on Windows as well.

Bug: 117921091
Test: layoutlib tests
Change-Id: I9c676aa1f2fb3ba6b78b1a6cbd9c8c25cfab0958
2020-02-05 17:28:45 +00:00
Automerger Merge Worker
04be13bb01 Merge "Correct a permission check / add a test" am: 05cf3e896c
Change-Id: I770e101b009b86b8d94c5c6faa510baf042619b8
2020-02-05 17:21:13 +00:00
Automerger Merge Worker
74245220cc Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218ea am: e5506eb032 am: ad21c990e4
Change-Id: I2ef0bb817a190df4eb48b77020211954750aed66
2020-02-05 17:11:25 +00:00
Nadav Bar
37fe5fa718 Merge "AudioRecordingCofiguration#getClientUid - Throw SecurityException if client is missing permision" 2020-02-05 17:08:23 +00:00
Neil Fuller
05cf3e896c Merge "Correct a permission check / add a test" 2020-02-05 17:05:50 +00:00
Automerger Merge Worker
ad21c990e4 Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218ea am: e5506eb032
Change-Id: Ie22caa7c82eeeb364a6b43b38dd87431d1312114
2020-02-05 17:00:51 +00:00
TreeHugger Robot
9d6c071842 Merge "Don't set REVOKED_COMPAT for background permission that isn't granted." 2020-02-05 16:55:51 +00:00
Automerger Merge Worker
e5506eb032 Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218ea
Change-Id: If9079b606b579ec82b4803adf6abfdf205599eeb
2020-02-05 16:47:14 +00:00
Treehugger Robot
a970f218ea Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." 2020-02-05 16:35:48 +00:00
Automerger Merge Worker
df801ee4c0 Merge "Clean up options for ART runtime." am: 5c517f5ae9 am: 94754ea0e7 am: 069a85e865
Change-Id: Id7de5e66472e77a94128d9eb28a3e26d1d3a1298
2020-02-05 16:23:22 +00:00
Julia Reynolds
50011ddc1d Protect against server crashes
In case of parceling errors

Test: atest
Fixes: 70181755
Change-Id: I18fe1421b2f6f28f6b8fff6001ea0d8d712fec7c
2020-02-05 16:16:27 +00:00
Julia Reynolds
ea58c20339 Protect against bad uris
Test: atest
Fixes: 148260893
Change-Id: I0b7663a674689ef957c81c6ba55c4b90466bcd75
2020-02-05 16:16:00 +00:00
Automerger Merge Worker
069a85e865 Merge "Clean up options for ART runtime." am: 5c517f5ae9 am: 94754ea0e7
Change-Id: I59be9bf44a85e128b209e5373333fe29805d841d
2020-02-05 16:07:51 +00:00
Automerger Merge Worker
94754ea0e7 Merge "Clean up options for ART runtime." am: 5c517f5ae9
Change-Id: Ibc2f55904f5a9ae4d1f2d2dde9668f6de3c61403
2020-02-05 15:53:31 +00:00