OSDN Git Service
Jack Yu [Wed, 27 Mar 2019 17:16:12 +0000 (10:16 -0700)]
[automerger skipped] Merge "Renamed DataSpecificRegistrationState" am:
86675ed5c0 am:
5a1db25c73
am:
f416a3ed0b -s ours
am skip reason: change_id I1a623c18f02cfd19ca1af9df912d859b363f42d1 with SHA1
dba103204c is in history
Change-Id: I4e8c53e541b7ff3f0001ae876d04164ef47bf8ec
Jack Yu [Wed, 27 Mar 2019 17:01:24 +0000 (10:01 -0700)]
Merge "Renamed DataSpecificRegistrationState" am:
86675ed5c0
am:
5a1db25c73
Change-Id: Ibb0ca2e282ff3671d520a9367a65b281e18ca1d7
Carmen Agimof [Wed, 27 Mar 2019 16:51:57 +0000 (16:51 +0000)]
Merge "Pull info about apps installed on external storage."
Jack Yu [Wed, 27 Mar 2019 16:51:07 +0000 (09:51 -0700)]
Merge "Renamed DataSpecificRegistrationState"
am:
86675ed5c0
Change-Id: Ice5fa2213a8a1850e6a6842c197d5926c0193b3c
TreeHugger Robot [Wed, 27 Mar 2019 16:49:13 +0000 (16:49 +0000)]
Merge "Suppress the initial notification when the app is foreground"
Jack Yu [Wed, 27 Mar 2019 16:39:46 +0000 (16:39 +0000)]
Merge "Renamed DataSpecificRegistrationState"
Nader Jawad [Wed, 27 Mar 2019 16:39:03 +0000 (16:39 +0000)]
Merge "Added framework APIs to leverage new BlendMode API"
Joe Onorato [Wed, 27 Mar 2019 16:27:34 +0000 (16:27 +0000)]
Merge "incidentd sections for userdebug and eng are compiled out"
TreeHugger Robot [Wed, 27 Mar 2019 16:24:25 +0000 (16:24 +0000)]
Merge "Remove unused work mode animations"
Yao Chen [Wed, 27 Mar 2019 16:21:15 +0000 (16:21 +0000)]
Merge "Report the last atom tag, uid in the case of log loss."
Andrei-Valentin Onea [Wed, 27 Mar 2019 15:31:16 +0000 (15:31 +0000)]
Merge "Add app_compat flags for hidden api logging"
TreeHugger Robot [Wed, 27 Mar 2019 15:24:43 +0000 (15:24 +0000)]
Merge "Fix TB bugs in QSCustomizer TileAdapter"
Siarhei Vishniakou [Wed, 27 Mar 2019 15:19:43 +0000 (08:19 -0700)]
[automerger skipped] Merge "Move tag definitions into policy" am:
3200c0bcb8 am:
e322940fa9
am:
92e2e05e13 -s ours
am skip reason: change_id I1fde2a2e7451ec67987ad3b09abc28be64410427 with SHA1
4dfa47054e is in history
Change-Id: Iffbb72939a0652adbc4ecc9d5ce795e816f96986
Amin Shaikh [Tue, 26 Mar 2019 15:19:36 +0000 (11:19 -0400)]
Remove unused work mode animations
Use the status bar icon as the QS icon. No visual change.
Bug:
129398746
Test: make
Change-Id: Ibbd78c678d1b1c5e9c7bff7b974c0e183613724c
Siarhei Vishniakou [Wed, 27 Mar 2019 15:05:59 +0000 (08:05 -0700)]
Merge "Move tag definitions into policy" am:
3200c0bcb8
am:
e322940fa9
Change-Id: I9e26a191ce5aff6a2ae698fbdd3cbdccfc90a4cd
TreeHugger Robot [Wed, 27 Mar 2019 15:00:34 +0000 (15:00 +0000)]
Merge "Fix system crash during RWC#resumeHomeActivity called."
Fabian Kozynski [Wed, 27 Mar 2019 14:56:09 +0000 (14:56 +0000)]
Merge "Mobile data can be turned off from keyguard"
Siarhei Vishniakou [Wed, 27 Mar 2019 14:55:01 +0000 (07:55 -0700)]
Merge "Move tag definitions into policy"
am:
3200c0bcb8
Change-Id: I64c8ac2e104c025ee3f4aed88d03e6c9aa9bcabe
Treehugger Robot [Wed, 27 Mar 2019 14:41:12 +0000 (14:41 +0000)]
Merge "Move tag definitions into policy"
Carmen Agimof [Mon, 4 Mar 2019 14:39:14 +0000 (14:39 +0000)]
Pull info about apps installed on external storage.
Bug:
123688171
Test: Manually tested using statsd_testdrive script
Change-Id: Ie47c69c1177d77993907d7ff8ef52691a0c2eaef
Andrei-Valentin Onea [Wed, 27 Mar 2019 14:16:58 +0000 (07:16 -0700)]
[automerger skipped] Merge changes from topic "unsupported-internal" am:
2f573ac6f8 am:
6acb2106f7
am:
1a129b474d -s ours
am skip reason: change_id Ia5306f4713298b46ae3aba6fc9d87fae41f8a593 with SHA1
15884391c0 is in history
Change-Id: I962641ad350c2d6602b274d2ee4562b3dc463c75
Andrei-Valentin Onea [Wed, 27 Mar 2019 14:07:16 +0000 (07:07 -0700)]
Merge changes from topic "unsupported-internal" am:
2f573ac6f8
am:
6acb2106f7
Change-Id: I98fdc3085646e3378560dc66eb7c46dfb74aee13
TreeHugger Robot [Wed, 27 Mar 2019 14:02:41 +0000 (14:02 +0000)]
Merge "Update desired heights docs based on feedback from CL after it was submitted"
Andrei-Valentin Onea [Wed, 27 Mar 2019 13:56:12 +0000 (06:56 -0700)]
Merge changes from topic "unsupported-internal"
am:
2f573ac6f8
Change-Id: I0fedf5c754a59a9c57b3abd00adff00d58b4930c
Andrei-Valentin Onea [Wed, 27 Mar 2019 13:40:15 +0000 (13:40 +0000)]
Merge changes from topic "unsupported-internal"
* changes:
Add @UnsupportedAppUsage annotations
Add android internal dirs to hiddenapi-mappings
Steven Wu [Wed, 27 Mar 2019 13:39:27 +0000 (13:39 +0000)]
Merge "Add logging to indiciate whether a bubble is read or unread."
TreeHugger Robot [Wed, 27 Mar 2019 13:19:50 +0000 (13:19 +0000)]
Merge "Add lock icon to bouncer when scrimmed"
TreeHugger Robot [Wed, 27 Mar 2019 13:11:49 +0000 (13:11 +0000)]
Merge "Filter app-ops from for foreground notifications"
Fabian Kozynski [Thu, 21 Mar 2019 16:09:33 +0000 (12:09 -0400)]
Fix TB bugs in QSCustomizer TileAdapter
* When saving the specs on exit, make sure that TileAdapter is left in a
good state. This meanse removing the placeholder if it exists and
setting it to ACTION_NONE
* Update mTileDividerIndex when adding and removing a place holder. It
doesn't need to be updated manually after a completed add, move or
remove operation as we call #updateDividerLocations in #move
* When adding a tile in the position before last, it gets added one
position before that. This happen because of the fix for off by one that
is not needed anymore.
Fixes:
129059015
Fixes:
129001337
Test: manual using TB. Adding, removing and moving tiles, in particular
to positions near the end.
Change-Id: I010d118b15c1cad3c0ab0544b515eb9c5b53b2ce
Nadav Bar [Wed, 27 Mar 2019 08:16:02 +0000 (10:16 +0200)]
Filter app-ops from for foreground notifications
This fixes inconsistency of showing the app ops indicators in the status bar
and foreground notifications.
Specifically, the issue that were seen is that the microphone indicator was also shown for system apps
without a launcher that have the recording pre-granted.
Bug:
129263222.
Change-Id: I6f6faf1552d3721f6fc34c650b5601e90d172db6
Test: Manually.
TreeHugger Robot [Wed, 27 Mar 2019 12:34:58 +0000 (12:34 +0000)]
Merge "Fix AppCompactorTest and add a presubmit TEST_RULE"
TreeHugger Robot [Wed, 27 Mar 2019 12:05:16 +0000 (12:05 +0000)]
Merge "Add ability to take on demand system heap dumps."
Linus Tufvesson [Tue, 26 Mar 2019 17:31:14 +0000 (17:31 +0000)]
Fix AppCompactorTest and add a presubmit TEST_RULE
Test will run as presubmit if AppCompactor.java is modified.
Modifying server/TEST_MAPPING to add "include-filter":
"com.android.server." to make sure it still runs as expected.
Bug:
128613287
Bug:
129341058
Test: atest --test-mapping [while in com/android/server/am/]
Test: atest FrameworksMockingServicesTests:AppCompactorTest
Change-Id: I6238f83c0f94d9a9ca593ddab5169667150a5583
Andrei Onea [Wed, 27 Mar 2019 10:32:55 +0000 (10:32 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
com.android.internal.app
com.android.internal.database
com.android.internal.http
com.android.internal.os
com.android.internal.policy
com.android.internal.util
com.android.internal.view
com.android.internal.view.menu
com.android.internal.widget
com.android.server.net
com.android.server
com.google.android.collect
com.google.android.util
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: Ia5306f4713298b46ae3aba6fc9d87fae41f8a593
Change-Id: Ie26033d486033289ad3e010a534a921d29c3b2ca
Pavel Grafov [Wed, 27 Mar 2019 11:10:38 +0000 (11:10 +0000)]
Merge "Fix NPE when querying serial number of a partial user."
Jack He [Wed, 27 Mar 2019 10:34:59 +0000 (03:34 -0700)]
[automerger skipped] Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev am:
0c9ce0913c -s ours
am:
0cc9d441d6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie89b4f2831136ff800bc68c6cda9d80626a49319
Andrei Onea [Fri, 22 Mar 2019 14:56:51 +0000 (14:56 +0000)]
Add android internal dirs to hiddenapi-mappings
Bug:
110868826
Test: m hiddenapi-mappings
(cherry picked from commit
77b22e33b6f9f85567bddd420488f0e88fe27bff)
Merged-In: Ie13962cc6a58af88e63a95c7f0d846aceda11f53
Change-Id: Ic6d0f663f79466d0d8692a3ebfe4a9792cd7ca07
Jack He [Wed, 27 Mar 2019 10:29:09 +0000 (03:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev
am:
0c9ce0913c -s ours
am skip reason: SHA1
0c9ce0913c skipped by user siyuanh
Change-Id: I39d8af52f6e3c7614f4a024689c7c4ee0a16997d
TreeHugger Robot [Wed, 27 Mar 2019 09:42:47 +0000 (09:42 +0000)]
Merge "Instead of duplicating test config, use imports."
lumark [Wed, 27 Mar 2019 08:40:46 +0000 (16:40 +0800)]
Fix system crash during RWC#resumeHomeActivity called.
Add global lock when calling RWC#resumeHomeActivity to
fix the CL[1] that calling method by post runnable,
system may crash due to race condition during force-stop
launcher package.
[1]: I243fab507268f81df0a8067883157d63f0f79c22
Fix:
129352498
Test: atest TaplTestsLauncher3 without system crash.
Change-Id: I2d63ee43f8ca832d3f1c5e49b518af712ac6e0d3
Android Build Merger (Role) [Wed, 27 Mar 2019 08:35:21 +0000 (08:35 +0000)]
Merge "Merge "Enable more logs for networking" am:
f3736d67f8 am:
310609b8be am:
d33e31e27a"
Lorenzo Colitti [Wed, 27 Mar 2019 08:34:53 +0000 (01:34 -0700)]
Merge "Enable more logs for networking" am:
f3736d67f8 am:
310609b8be
am:
d33e31e27a
Change-Id: Icd81490cabaaf1d164ce77bda76b196b869c8721
Anton Hansson [Wed, 27 Mar 2019 08:31:49 +0000 (08:31 +0000)]
Merge "Revoke all relevant shared permission on uninstall"
TreeHugger Robot [Wed, 27 Mar 2019 08:22:54 +0000 (08:22 +0000)]
Merge "Protect spy by holding lock"
Lorenzo Colitti [Wed, 27 Mar 2019 08:22:13 +0000 (01:22 -0700)]
Merge "Enable more logs for networking" am:
f3736d67f8
am:
310609b8be
Change-Id: Ie5dd53b7a8f9fbab801b5476b2ce89489b7ba09c
TreeHugger Robot [Wed, 27 Mar 2019 08:18:23 +0000 (08:18 +0000)]
Merge "Remove ic_empty_recents.xml from launcher icon packs"
Lorenzo Colitti [Wed, 27 Mar 2019 08:13:26 +0000 (01:13 -0700)]
Merge "Enable more logs for networking"
am:
f3736d67f8
Change-Id: I422863512aa78849dcb5d61d986d7f8bbff24fd2
Lorenzo Colitti [Wed, 27 Mar 2019 07:55:35 +0000 (07:55 +0000)]
Merge "Enable more logs for networking"
Joe Onorato [Mon, 25 Mar 2019 03:57:16 +0000 (20:57 -0700)]
incidentd sections for userdebug and eng are compiled out
Previously, the decision to include or not include them was
done at runtime. This changes them to be behind a compile
time flag. It's just safer, because the code just isn't there
instead of being dependent on a system property.
Test: bit GtsIncidentManagerTestCases:*
Bug:
123543706
Change-Id: If4e611914a7b0acd399ae27e55af8f718aee3ec8
Joe Onorato [Wed, 27 Mar 2019 07:20:25 +0000 (00:20 -0700)]
Fix the build
Change-Id: I770ed6fd8de0479655f587db68a09882eb6cceb5
Joe Onorato [Wed, 27 Mar 2019 06:54:18 +0000 (06:54 +0000)]
Merge "Fix api council feedback"
Mill Chen [Wed, 27 Mar 2019 06:34:50 +0000 (06:34 +0000)]
Merge "Update visual: AppSwitchPreference alignment"
Shawn Lin [Wed, 27 Mar 2019 06:13:46 +0000 (06:13 +0000)]
Merge "Fixed incorrect color of volume panel after theme change"
TreeHugger Robot [Wed, 27 Mar 2019 06:11:11 +0000 (06:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Chenbo Feng [Wed, 27 Mar 2019 05:53:13 +0000 (22:53 -0700)]
Merge "Get the permission information for native services" am:
743a1c8001 am:
cfe2cc942a
am:
875019ae5f
Change-Id: I798cf00caee4f505d45929ddf9ccd03e658c4c3c
TreeHugger Robot [Wed, 27 Mar 2019 05:43:24 +0000 (05:43 +0000)]
Merge "Add log metrics for Aware status dialog"
Chenbo Feng [Wed, 27 Mar 2019 05:42:38 +0000 (22:42 -0700)]
Merge "Get the permission information for native services" am:
743a1c8001
am:
cfe2cc942a
Change-Id: I61bdf44239c880ef1b95c31a037f64158a32d789
Chenbo Feng [Wed, 27 Mar 2019 05:33:27 +0000 (22:33 -0700)]
Merge "Get the permission information for native services"
am:
743a1c8001
Change-Id: I806e3e948dfab0cc8c691c20f377bbc3a24240a6
Treehugger Robot [Wed, 27 Mar 2019 05:21:29 +0000 (05:21 +0000)]
Merge "Get the permission information for native services"
Jack Yu [Thu, 21 Mar 2019 23:33:15 +0000 (16:33 -0700)]
Renamed DataSpecificRegistrationState
Renamed DataSpecificRegistrationState to
DataSpecificRegistrationInfo. And added some
APIs to test API so they can be accessed by
CTS.
Test: Manual
Bug:
127657991
Merged-In: I1a623c18f02cfd19ca1af9df912d859b363f42d1
Change-Id: I1a623c18f02cfd19ca1af9df912d859b363f42d1
(cherry picked from commit
dba103204cf09187dbb0147dac39457f5993769f)
TreeHugger Robot [Wed, 27 Mar 2019 05:09:25 +0000 (05:09 +0000)]
Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev
TreeHugger Robot [Wed, 27 Mar 2019 04:43:33 +0000 (04:43 +0000)]
Merge "Adaptive bubble icon - match theme using adaptive icon drawable"
TreeHugger Robot [Wed, 27 Mar 2019 04:33:27 +0000 (04:33 +0000)]
Merge "Fix some touch issues"
Joe Onorato [Mon, 25 Mar 2019 21:16:28 +0000 (14:16 -0700)]
Fix api council feedback
Bug:
126700270
Test: treehugger
Change-Id: Ib274c7c7975b6260b018d63216e03fd8eff57223
TreeHugger Robot [Wed, 27 Mar 2019 04:18:35 +0000 (04:18 +0000)]
Merge "Fixing wrong target check"
TreeHugger Robot [Wed, 27 Mar 2019 04:14:46 +0000 (04:14 +0000)]
Merge "Fix JNI NULL class error"
Joe Onorato [Wed, 27 Mar 2019 04:06:06 +0000 (04:06 +0000)]
Merge "incidentd can now handle multiple callers asking it for incident reports"
Lucas Dupin [Tue, 26 Mar 2019 23:49:24 +0000 (16:49 -0700)]
Add lock icon to bouncer when scrimmed
Lock icon needs to be reparented to the bouncer when we're
asking for a pin on top of the notification panel, since the
scrim would cove the whole lock screen.
Fixes:
129160870
Test: atest KeyguardBouncerTest
Test: atest StatusBarKeyguardViewManagerTest
Test: double tap notification
Test: swipe up to unlock
Test: swipe to shade locked, tap notification
Test: repeat with and without pin
Change-Id: I476ab2822da0040cfcfe7f8bc775b76407f0c613
TreeHugger Robot [Wed, 27 Mar 2019 03:32:18 +0000 (03:32 +0000)]
Merge "Do not grant already granted permission"
TreeHugger Robot [Wed, 27 Mar 2019 03:31:25 +0000 (03:31 +0000)]
Merge "Modify fontchain_linter.py for Unicode 12.0 ."
Mady Mellor [Wed, 27 Mar 2019 03:22:35 +0000 (20:22 -0700)]
Suppress the initial notification when the app is foreground
Test: atest BubbleControllerTest
Bug:
123542531
Change-Id: I543df6d0a0c5af0f3feb0b3fe4cd9ef92e5a21c9
Remi NGUYEN VAN [Wed, 27 Mar 2019 03:28:03 +0000 (20:28 -0700)]
Merge "Use SystemApi framework parcelables directly" am:
021ea66aea am:
4864ffd97e
am:
ddac1161d9
Change-Id: I99a21274856a0f9903cc8242f91735128117919f
Po-Chien Hsueh [Wed, 27 Mar 2019 03:21:19 +0000 (03:21 +0000)]
Merge "Add a permission, INSTALL_DYNAMIC_SYSTEM"
Po-Chien Hsueh [Wed, 27 Mar 2019 03:20:54 +0000 (03:20 +0000)]
Merge "Improve javadoc for DynamicSystemClient"
Po-Chien Hsueh [Wed, 27 Mar 2019 03:20:25 +0000 (03:20 +0000)]
Merge "Send URL using Uri instead of String"
Remi NGUYEN VAN [Wed, 27 Mar 2019 03:18:30 +0000 (20:18 -0700)]
Merge "Use SystemApi framework parcelables directly" am:
021ea66aea
am:
4864ffd97e
Change-Id: I28b60bcaf76d8902f3cd9d7956931c98d8d85710
Chenbo Feng [Wed, 27 Mar 2019 03:14:10 +0000 (20:14 -0700)]
Merge "Fix the INTERNET related permissions" am:
88fb51277b am:
ddd4e08d2c
am:
50c9cca36d
Change-Id: Id14b54002f7b3496df9e7943a127f63dcf4e82b2
Remi NGUYEN VAN [Wed, 27 Mar 2019 03:09:17 +0000 (20:09 -0700)]
Merge "Use SystemApi framework parcelables directly"
am:
021ea66aea
Change-Id: I33ab2a6935edc25eb0cfcaee258ef6da92ed2c83
Mady Mellor [Wed, 27 Mar 2019 03:05:16 +0000 (03:05 +0000)]
Merge "Auto expand bubbles when foreground with the flag set"
Chenbo Feng [Wed, 27 Mar 2019 03:02:14 +0000 (20:02 -0700)]
Merge "Fix the INTERNET related permissions" am:
88fb51277b
am:
ddd4e08d2c
Change-Id: I7b07ca0ef7966f0ebee17cabe2eb79c5d6381228
Treehugger Robot [Wed, 27 Mar 2019 02:55:15 +0000 (02:55 +0000)]
Merge "Use SystemApi framework parcelables directly"
Chenbo Feng [Wed, 27 Mar 2019 02:52:57 +0000 (19:52 -0700)]
Merge "Fix the INTERNET related permissions"
am:
88fb51277b
Change-Id: Id97b1ea945409e938158f30efd564b10c9e81380
TreeHugger Robot [Wed, 27 Mar 2019 02:50:23 +0000 (02:50 +0000)]
Merge "Move tag definitions into policy"
Chenbo Feng [Tue, 26 Mar 2019 21:36:34 +0000 (14:36 -0700)]
Get the permission information for native services
For native services such as mediaserver and audioserver, the permission
information cannot be retrieved from getInstalledPackages. Instead, the
high level permission information is avalaible in systemConfigs. With
those permission information, netd can store the complete list of uids
that have UPDATE_DEVICE_STATS permission.
Bug:
128944261
Test: dumpsys netd trafficcontroller
Change-Id: I0331d5a3a5b927a351fcfe6689ef1ba2b993db0c
Treehugger Robot [Wed, 27 Mar 2019 02:35:35 +0000 (02:35 +0000)]
Merge "Fix the INTERNET related permissions"
shawnlin [Tue, 26 Mar 2019 12:58:32 +0000 (20:58 +0800)]
Fixed incorrect color of volume panel after theme change
Apply theme change to volume panel.
Fixes:
127674670
Test: manual - enable battery saver and talk back then check the volume
panel
Change-Id: I48f292012ef3abec45f35836aad9c261cd9a039c
Edgar Wang [Tue, 26 Mar 2019 12:18:21 +0000 (20:18 +0800)]
Add log metrics for Aware status dialog
Bug:
128853573
Test: rebuild
Change-Id: I90ac8ffff10d8d75a4b0fa4b282855276e32548e
TreeHugger Robot [Wed, 27 Mar 2019 02:13:47 +0000 (02:13 +0000)]
Merge "Remove unused auto brightness drawables."
Keun-young Park [Wed, 27 Mar 2019 02:08:34 +0000 (02:08 +0000)]
Merge "Decide the current user after PHASE_THIRD_PARTY boot phase"
Lucas Lin [Wed, 27 Mar 2019 02:00:50 +0000 (19:00 -0700)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity" am:
9e3297a099 am:
d593ac0f90
am:
801be56a0f
Change-Id: I80399f9980119342ba5cd3d4f1922badb1fee3e9
Lucas Dupin [Wed, 27 Mar 2019 01:53:21 +0000 (01:53 +0000)]
Merge "Fix NPE when view doesn't have a parent"
TreeHugger Robot [Wed, 27 Mar 2019 01:53:17 +0000 (01:53 +0000)]
Merge "ACTION_SPEAKERPHONE_STATE_CHANGED: only broadcast by system"
Lucas Lin [Wed, 27 Mar 2019 01:49:59 +0000 (18:49 -0700)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity" am:
9e3297a099
am:
d593ac0f90
Change-Id: I4b0a70cbfdce8f43c07275ace151d3ab464da5a4
Lucas Lin [Wed, 27 Mar 2019 01:41:00 +0000 (18:41 -0700)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
am:
9e3297a099
Change-Id: I0639d4ccd7c3211595ede82bce3daa87ae759e10
TreeHugger Robot [Wed, 27 Mar 2019 01:33:09 +0000 (01:33 +0000)]
Merge "Reset the whitelist helper for augmented autofill and content capture when service changes."
Badhri Jagan Sridharan [Wed, 27 Mar 2019 01:30:17 +0000 (18:30 -0700)]
[automerger skipped] Merge "Fix missing combination check SINK/DEVICE" am:
25a7e6ed25 am:
a890cc7c97
am:
450a526608 -s ours
am skip reason: change_id I5e652fbf9313bd2c122fe728d58e577085632253 with SHA1
665eb216e5 is in history
Change-Id: If0d75b0ed5bd2afbfe1d05cf388b3f0a2cc74b70
Lucas Lin [Wed, 27 Mar 2019 01:29:51 +0000 (01:29 +0000)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
Sunny Goyal [Wed, 27 Mar 2019 01:17:25 +0000 (18:17 -0700)]
Fixing wrong target check
Test: compiled framework
Change-Id: Ia6fb1d8920fc0df066509c4c15a123e4459d2285
Badhri Jagan Sridharan [Wed, 27 Mar 2019 01:03:54 +0000 (18:03 -0700)]
Merge "Fix missing combination check SINK/DEVICE" am:
25a7e6ed25
am:
a890cc7c97
Change-Id: I284e113c8f0154032dc54fd3e2053aefa5f78503
TreeHugger Robot [Wed, 27 Mar 2019 01:02:57 +0000 (01:02 +0000)]
Merge "Fix crash after dequeueNativeBuffer fails"