OSDN Git Service
Dan Sandler [Wed, 30 Jan 2019 21:34:35 +0000 (13:34 -0800)]
Merge "Some of us are weird." am:
559d6018b6 am:
99c3f55c89
am:
9007b5e977
Change-Id: Ie403557c8295b7d708ffcb0fbf800e8ac27f31a7
Julia Reynolds [Wed, 30 Jan 2019 21:27:53 +0000 (21:27 +0000)]
Merge "Tests for matchesCallFilter"
Dan Sandler [Wed, 30 Jan 2019 21:24:06 +0000 (13:24 -0800)]
Merge "Some of us are weird." am:
559d6018b6
am:
99c3f55c89
Change-Id: I9605a2e5f9efd41ca4c5eb0e6f0c636e6920774d
Robert Shih [Wed, 30 Jan 2019 21:23:10 +0000 (21:23 +0000)]
Merge "MediaPlayer2: mark MediaPlayer-style DRM APIs TestApi"
TreeHugger Robot [Wed, 30 Jan 2019 21:23:02 +0000 (21:23 +0000)]
Merge "Reconcile logging of blocking helper and manual notification management."
Dan Sandler [Wed, 30 Jan 2019 21:15:53 +0000 (13:15 -0800)]
Merge "Some of us are weird."
am:
559d6018b6
Change-Id: Icf919c902d9a7e5e8eda1ac2e7f551cf51891281
Quang Luong [Wed, 30 Jan 2019 21:14:10 +0000 (21:14 +0000)]
Merge "Simplified OSU status strings in wifi picker"
TreeHugger Robot [Wed, 30 Jan 2019 21:05:40 +0000 (21:05 +0000)]
Merge "Put Vulkan WebViews on a HW layer if stencil clip"
Michal Karpinski [Wed, 30 Jan 2019 21:00:55 +0000 (21:00 +0000)]
Merge "Allow apps that are currently instrumenting with background activity starts privileges to start activities from background"
TreeHugger Robot [Wed, 30 Jan 2019 20:59:05 +0000 (20:59 +0000)]
Merge "Add metrics constants for dialog used to rename mobile networks"
Dan Sandler [Wed, 30 Jan 2019 20:58:46 +0000 (20:58 +0000)]
Merge "Some of us are weird."
Selim Cinek [Wed, 30 Jan 2019 20:56:12 +0000 (20:56 +0000)]
Merge "Render ImageWallpaper with OpenGL ES and apply visual effects."
TreeHugger Robot [Wed, 30 Jan 2019 20:54:19 +0000 (20:54 +0000)]
Merge "Update uid process state synchronously"
David Su [Wed, 30 Jan 2019 20:50:24 +0000 (20:50 +0000)]
Merge changes from topics "link-probe-overlay", "link-probe-feature-flag"
* changes:
Link Probing: Add overlay flag to disable feature by default
Link Probing: Add feature flag
TreeHugger Robot [Wed, 30 Jan 2019 20:46:17 +0000 (20:46 +0000)]
Merge "Switch ServiceWatcher clients to fg thread"
Pavel Grafov [Wed, 30 Jan 2019 20:28:07 +0000 (12:28 -0800)]
Merge "VpnDialogs should be able to control always-on VPN." am:
d5d7492040 am:
09aa059ec4
am:
c97f2a7c71
Change-Id: Ib0d3fea2da62271ff7e9fc92738ae4b0a1270182
TreeHugger Robot [Wed, 30 Jan 2019 20:15:25 +0000 (20:15 +0000)]
Merge "Fix ExtServices tests"
Pavel Grafov [Wed, 30 Jan 2019 20:13:46 +0000 (12:13 -0800)]
Merge "VpnDialogs should be able to control always-on VPN." am:
d5d7492040
am:
09aa059ec4
Change-Id: I3d2f5c5a7bc199551aad1ddb656dc076e3121fb3
Pavel Grafov [Wed, 30 Jan 2019 19:48:25 +0000 (11:48 -0800)]
Merge "VpnDialogs should be able to control always-on VPN."
am:
d5d7492040
Change-Id: I08f5f69168f58318afb0fd848a8177319018356a
Treehugger Robot [Wed, 30 Jan 2019 19:34:47 +0000 (19:34 +0000)]
Merge "VpnDialogs should be able to control always-on VPN."
TreeHugger Robot [Wed, 30 Jan 2019 19:29:14 +0000 (19:29 +0000)]
Merge "Ban non-notification vibrations of background process"
Soonil Nagarkar [Wed, 30 Jan 2019 18:02:40 +0000 (10:02 -0800)]
Switch ServiceWatcher clients to fg thread
Location should run on foreground thread so it is not blocked by other
components making disk reads/db access/etc...
Test: manually
Change-Id: I2a8a37db920f4324cb0115bcde959a9c9a54ada4
Chen Xu [Wed, 30 Jan 2019 18:48:15 +0000 (10:48 -0800)]
[automerger skipped] Merge "new API for IMS call fail cause" am:
ebad5a64d0 am:
634594fb41
am:
072ca6f94d -s ours
am skip reason: change_id Ia047b7ba2345ad0c8d998506026defc02eb80dc9 with SHA1
6ac5fc19e6 is in history
Change-Id: I2dda2ebd32cdc2e5ef380ffc0926472df1aab0b6
Stan Iliev [Tue, 6 Nov 2018 22:35:50 +0000 (17:35 -0500)]
Put Vulkan WebViews on a HW layer if stencil clip
Put WebViews in a HW layer, if the clip is a non-rect.
This CL reuses logic implemented by ag/705975. This used
to be the way GL WebViews were drawn in Android M.
Implement complex clip detection at recording
time, which was not previously supported by the canvas.
Vulkan WebViews using GL interop are already drawn
in a layer, but this CL will be useful when WebView
supports new Vulkan interop.
Test: WebView CTS pass for Vulkan and GL
Bug:
115613038
Change-Id: I9b02c6f4de8efd504a7507633f3d849004215a16
TreeHugger Robot [Wed, 30 Jan 2019 18:42:20 +0000 (18:42 +0000)]
Merge "Suppress -Wimplicit-fallthrough in aapt code"
Android Build Merger (Role) [Wed, 30 Jan 2019 18:37:37 +0000 (18:37 +0000)]
Merge "[automerger skipped] Merge "[layout precompilation] Add testing hook for precompiled layouts" am:
15b86c9037 am:
0b329918fc am:
ce7aa1bf68 -s ours am skip reason: change_id Ib6b62d79a9ca7aefefff8639752aa5838e491038 with SHA1
25aa4edaa8 is in history"
Mehdi Alizadeh [Wed, 30 Jan 2019 18:37:17 +0000 (18:37 +0000)]
Merge "Ensure some calls are available for testing"
Eric Holk [Wed, 30 Jan 2019 18:37:02 +0000 (10:37 -0800)]
[automerger skipped] Merge "[layout precompilation] Add testing hook for precompiled layouts" am:
15b86c9037 am:
0b329918fc
am:
ce7aa1bf68 -s ours
am skip reason: change_id Ib6b62d79a9ca7aefefff8639752aa5838e491038 with SHA1
25aa4edaa8 is in history
Change-Id: I210fe3ed712dd5d67d11682855216bbc04057084
Chen Xu [Wed, 30 Jan 2019 18:35:38 +0000 (10:35 -0800)]
Merge "new API for IMS call fail cause" am:
ebad5a64d0
am:
634594fb41
Change-Id: Ie6362bc5a6e7c372e7e60277feb48436a852f610
Eric Holk [Wed, 30 Jan 2019 18:24:43 +0000 (10:24 -0800)]
Merge "[layout precompilation] Add testing hook for precompiled layouts" am:
15b86c9037
am:
0b329918fc
Change-Id: I6417624f74b779e05f5a4a30c484487a943697c6
Robert Shih [Fri, 25 Jan 2019 23:38:00 +0000 (15:38 -0800)]
MediaPlayer2: mark MediaPlayer-style DRM APIs TestApi
Keep MediaPlayer-style DRM APIs as `@TestApi`s to help test
regressions between MediaPlayer-style and MediaPlayer2-style
DRM APIs.
Bug:
123425309
Test: compiles
Change-Id: I880129eff1b12a1476be240f1566bb4eedc94a63
Sudheer Shanka [Wed, 30 Jan 2019 18:22:02 +0000 (18:22 +0000)]
Merge "Don't ignore COLUMN_MEDIA_SCANNED values from caller."
Chen Xu [Wed, 30 Jan 2019 18:18:21 +0000 (10:18 -0800)]
Merge "new API for IMS call fail cause"
am:
ebad5a64d0
Change-Id: I70870709a27c48bc30c748e04e53c72780224bd8
Eric Holk [Wed, 30 Jan 2019 18:11:53 +0000 (10:11 -0800)]
Merge "[layout precompilation] Add testing hook for precompiled layouts"
am:
15b86c9037
Change-Id: I7c1e46dc5ebce025e1aafd6131596d352e0c1bc8
Chen Xu [Wed, 30 Jan 2019 18:01:56 +0000 (18:01 +0000)]
Merge "new API for IMS call fail cause"
TreeHugger Robot [Wed, 30 Jan 2019 18:01:14 +0000 (18:01 +0000)]
Merge "Widen allowed UID range for webview zygote."
Treehugger Robot [Wed, 30 Jan 2019 17:55:18 +0000 (17:55 +0000)]
Merge "[layout precompilation] Add testing hook for precompiled layouts"
Stefano Tommasini [Wed, 30 Jan 2019 17:53:47 +0000 (17:53 +0000)]
Merge "Revert "Revert "Add support for enabling backup in work profile in"""
Chen Xu [Wed, 30 Jan 2019 17:45:55 +0000 (17:45 +0000)]
Merge "Address API feedbacks for networktypebitmask"
Julia Reynolds [Wed, 30 Jan 2019 17:16:58 +0000 (12:16 -0500)]
Fix ExtServices tests
- Switch the tests from Android.mk to Android.bp. The app itself
cannot move over yet because it uses syntax not supported by bp
- Instrument the test package instead of the package udner test
- Also fix an actual error in a test
Test: this
Change-Id: I0af081ab25630e4e911d4d9cbb60a87b2f75be90
Fixes:
123572762
Leon Scroggins [Wed, 30 Jan 2019 17:37:47 +0000 (17:37 +0000)]
Merge "Add Canvas#drawColor(@ColorLong)"
TreeHugger Robot [Wed, 30 Jan 2019 17:35:20 +0000 (17:35 +0000)]
Merge "Add native boot flag namespace for activity_manager"
Android Build Merger (Role) [Wed, 30 Jan 2019 17:29:14 +0000 (17:29 +0000)]
Merge "[automerger skipped] Merge "Initialise hidden api usage logger pre-fork" am:
763747b7ce am:
c14670fc8e am:
6706993777 -s ours am skip reason: change_id I80f82092ef779a7dc1f1322cb7c05ebf5e59939b with SHA1
6cd1b70a1e is in history"
TreeHugger Robot [Wed, 30 Jan 2019 17:26:51 +0000 (17:26 +0000)]
Merge "Rename fsi_boot to dex_boot and the flag names"
Andrei-Valentin Onea [Wed, 30 Jan 2019 17:26:49 +0000 (09:26 -0800)]
[automerger skipped] Merge "Initialise hidden api usage logger pre-fork" am:
763747b7ce am:
c14670fc8e
am:
6706993777 -s ours
am skip reason: change_id I80f82092ef779a7dc1f1322cb7c05ebf5e59939b with SHA1
6cd1b70a1e is in history
Change-Id: I1b83fb33c4cee80fffc9d89ecdb2fbcaba24fe74
TreeHugger Robot [Wed, 30 Jan 2019 17:26:22 +0000 (17:26 +0000)]
Merge "Throw exception on mismatched system vs vendor"
Andrei-Valentin Onea [Wed, 30 Jan 2019 17:14:17 +0000 (09:14 -0800)]
Merge "Initialise hidden api usage logger pre-fork" am:
763747b7ce
am:
c14670fc8e
Change-Id: I10aba0942a240ee041306c1bf24e6bed37e62f0a
Makoto Onuki [Wed, 30 Jan 2019 17:11:42 +0000 (17:11 +0000)]
Merge "Deprecate SQLite connection timeout"
Pavel Grafov [Wed, 30 Jan 2019 17:11:33 +0000 (17:11 +0000)]
VpnDialogs should be able to control always-on VPN.
Bug:
77468593
Test: atest HostsideVpnTests#testIsAlwaysOnIsLockdown
Change-Id: I0a0c6b138c748a6cb8681c20c137f70ee1fc6cf9
Andrei-Valentin Onea [Wed, 30 Jan 2019 17:00:41 +0000 (09:00 -0800)]
Merge "Initialise hidden api usage logger pre-fork"
am:
763747b7ce
Change-Id: Ic1bd433cb1dc61c0f048c70f33360a41f7bde2c5
Will Brockman [Wed, 30 Jan 2019 15:59:36 +0000 (10:59 -0500)]
Reconcile logging of blocking helper and manual notification management.
Unify on ACTION_NOTE_CONTROLS for opening of a NotificationInfo, with
subtype to distinguish whether it's for BlockingHelper or not.
In the non-blocking-helper case, don't log user clicks, just the
action. We can come back to this, but the logs are currently
inaccurate and they aren't essential.
Bug:
123519980
Change-Id: I9189d52f9bd20126b0df5568c8be264107d569b3
Test: atest SystemUITests and manual testing.
TreeHugger Robot [Wed, 30 Jan 2019 16:49:43 +0000 (16:49 +0000)]
Merge "DMS: Avoid SurfaceControl query for display token"
Andrei-Valentin Onea [Wed, 30 Jan 2019 16:42:54 +0000 (16:42 +0000)]
Merge "Initialise hidden api usage logger pre-fork"
TreeHugger Robot [Wed, 30 Jan 2019 16:36:18 +0000 (16:36 +0000)]
Merge "Revise javadoc of EXTRA_FROM_TEXT_CLASSIFIER"
Fabian Kozynski [Wed, 30 Jan 2019 16:34:18 +0000 (16:34 +0000)]
Merge "API for querying/revoking current NotificationAssistant"
TreeHugger Robot [Wed, 30 Jan 2019 16:33:21 +0000 (16:33 +0000)]
Merge "Fix null RollbackManager in RollbackHealthObserver and minor todos"
Aurimas Liutikas [Wed, 30 Jan 2019 16:32:57 +0000 (08:32 -0800)]
Suppress -Wimplicit-fallthrough in aapt code
AaptAsssets intentinally falls through in a switch statement.
This change adds [[fallthrough]]; to suppress this implicit fallthrough.
frameworks/base/tools/aapt/AaptAssets.cpp:305:17: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
case 5:
^
frameworks/base/tools/aapt/AaptAssets.cpp:305:17: note: insert '[[fallthrough]];' to silence this warning
case 5:
^
[[fallthrough]];
frameworks/base/tools/aapt/AaptAssets.cpp:305:17: note: insert 'break;' to avoid fall-through
case 5:
^
break;
Test: make -j aapt
Change-Id: Ia9d2ca3b59eb804e20c6295791f6a19f0f5f63ab
Eric Holk [Fri, 18 Jan 2019 19:49:55 +0000 (11:49 -0800)]
[layout precompilation] Add testing hook for precompiled layouts
We want to be able to control at a fine grained level whether precompiled
layouts are enabled so we can compare inflation results with and without. This
changes adds a @TestApi method that supports this.
Bug:
111895153
Merged-In: Ib6b62d79a9ca7aefefff8639752aa5838e491038
Change-Id: I2f28f6912499825e52c17cc163be9c0fe93855cb
TreeHugger Robot [Wed, 30 Jan 2019 16:18:27 +0000 (16:18 +0000)]
Merge "[layout precompilation] Add testing hook for precompiled layouts"
Mady Mellor [Wed, 30 Jan 2019 15:53:24 +0000 (15:53 +0000)]
Merge "Improves pointer positioning & remove no-op when expanding"
Fabian Kozynski [Wed, 30 Jan 2019 15:50:39 +0000 (15:50 +0000)]
Merge "Fixed NPE when passing intent to permissioncontroller"
Ecco Park [Wed, 30 Jan 2019 15:50:05 +0000 (15:50 +0000)]
Merge "add eap_method and phase2_method string in enterpriseConfig for dump"
Julia Reynolds [Tue, 29 Jan 2019 21:19:36 +0000 (16:19 -0500)]
Tests for matchesCallFilter
Test: cts
Bug:
123406095
Change-Id: Ibece70d3e5d77d447ece4f3d3118b315a8d6e5cb
TreeHugger Robot [Wed, 30 Jan 2019 15:30:41 +0000 (15:30 +0000)]
Merge "Removed reserverd proto number."
TreeHugger Robot [Wed, 30 Jan 2019 15:24:40 +0000 (15:24 +0000)]
Merge "Remove CHOOSER_UI intent filter."
Remi NGUYEN VAN [Wed, 30 Jan 2019 15:19:07 +0000 (15:19 +0000)]
Merge "Add SystemApi for captive portal metrics"
Leon Scroggins III [Fri, 11 Jan 2019 18:36:39 +0000 (13:36 -0500)]
Add Canvas#drawColor(@ColorLong)
Bug:
120904891
Test: I857b8c1c9346285b2f6e4670c501c9d0d4053a0e
Change-Id: If08e8b805a4bba1a526efcd3cb05d4cd19f82eff
Annie Meng [Wed, 30 Jan 2019 14:45:16 +0000 (14:45 +0000)]
Merge "[Multi-user] Properly check for system apps in multi-user context"
Tony Mak [Mon, 28 Jan 2019 15:14:36 +0000 (15:14 +0000)]
Revise javadoc of EXTRA_FROM_TEXT_CLASSIFIER
Test: make
FIXES:
123223220
Change-Id: I4e79cab261a3540cc94d2cf19950f5cba22e06fe
Zimuzo [Wed, 30 Jan 2019 12:05:41 +0000 (12:05 +0000)]
Fix null RollbackManager in RollbackHealthObserver and minor todos
1. RollbackManager was instantiated by Context#getSystemService in
RollbackHealthObserver. At this time, RollbackManager has not yet
been published as a service to the system, so RollbackManager was null.
We now #getSystemService lazily so RollbackManager is never null.
2. Pass causePackages from RollbackHealthObserver to RollbackManager
3. Also fixed flaky ignored test exercising PackageWatchdog auto rollback
Test: atest RollbackTest
Bug:
123615508 112431924
Change-Id: I8f15c257b1efd96a96656405d3d7f74576a32c8e
Greg Daniel [Wed, 30 Jan 2019 14:24:36 +0000 (14:24 +0000)]
Merge "Update Vulkan skia creation to use apiVersion instead of instanceVersion"
Michal Karpinski [Tue, 29 Jan 2019 16:50:51 +0000 (16:50 +0000)]
Allow apps that are currently instrumenting with background activity
starts privileges to start activities from background
Test: atest WmTests:ActivityStarterTests
Test: atest google/perf/jank/SystemUI/UbSystemUIJankTests
Test: atest LightBarTests
Test: atest CtsActivityManagerDeviceTestCases
Bug:
123434182
Bug:
110956953
Bug:
122760822
Change-Id: I66dc700bcb4713838528094a35337bcb3770d229
Stefano Tommasini [Thu, 24 Jan 2019 17:52:30 +0000 (17:52 +0000)]
Revert "Revert "Add support for enabling backup in work profile in""
This reverts commit
0bfafb7f411a57fd576afa9d30b66885ab7831ab.
Reason for revert: Removing enforceUnlocked() should fix the bug and Backup now supports it.
Change-Id: Id06f63c62b0f43cd70da77df48674146d4cc0412
TreeHugger Robot [Wed, 30 Jan 2019 14:04:59 +0000 (14:04 +0000)]
Merge "Input devices configure on per-display basis (2/2)"
Yueming Wang [Wed, 30 Jan 2019 13:44:49 +0000 (13:44 +0000)]
Merge "Update startViewCalendarEventInManagedProfile API according to API review"
Julia Reynolds [Wed, 30 Jan 2019 13:41:08 +0000 (13:41 +0000)]
Merge "Add a setting for hiding silent status icons"
Remi NGUYEN VAN [Wed, 30 Jan 2019 13:01:20 +0000 (22:01 +0900)]
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
Matt Pietal [Wed, 30 Jan 2019 11:58:51 +0000 (11:58 +0000)]
Merge "Sharesheet content preview - adding text support only"
TreeHugger Robot [Wed, 30 Jan 2019 11:32:37 +0000 (11:32 +0000)]
Merge "Made ContentCapture's UserDataRemovalRequest getters public."
Misha Wagner [Wed, 30 Jan 2019 11:31:39 +0000 (11:31 +0000)]
Merge "Add more statistics on failure cases for value metrics"
Neil Fuller [Wed, 30 Jan 2019 11:29:43 +0000 (03:29 -0800)]
[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
Martijn Coenen [Wed, 30 Jan 2019 10:17:52 +0000 (11:17 +0100)]
Widen allowed UID range for webview zygote.
The webview zygote is shared for all users on the system, and so unlike
the app zygote, it can't use a single whitelisted UID range. For now,
clamp to the upper bound of the UID range, until we have a better idea.
This is still an improvement from the previous status quo, because it
will prevent setuid/setgid into system users.
Bug:
123597434
Test: builds, webview_zygote running
Change-Id: Ia975826ed5b1f20cabb46f60f5951723b1ba80c9
Neil Fuller [Wed, 30 Jan 2019 11:19:42 +0000 (03:19 -0800)]
Merge "Track ZygoteHooks API changes in libcore" am:
20bca262f5
am:
97ba02c505
Change-Id: I3b377b6bd83cf6d7d293c89931ac13560e9db2c7
Andrei Onea [Fri, 25 Jan 2019 16:29:44 +0000 (16:29 +0000)]
Initialise hidden api usage logger pre-fork
Topic: hidden-api-reporting-upcall
Test: m
Bug:
119217680
Change-Id: I8722f0bf4275fea4a8faf41d7b862c04b4014824
Merged-In: I80f82092ef779a7dc1f1322cb7c05ebf5e59939b
Neil Fuller [Wed, 30 Jan 2019 11:10:21 +0000 (03:10 -0800)]
Merge "Track ZygoteHooks API changes in libcore"
am:
20bca262f5
Change-Id: I9245629f0a5ba6fed9695f591396747eb1ae911c
Ahan Wu [Mon, 14 Jan 2019 12:38:14 +0000 (20:38 +0800)]
Render ImageWallpaper with OpenGL ES and apply visual effects.
We have to render image wallpaper with OpenGL ES to apply some amazing
visual effects.
Bug:
122803209
Test: Manually.
Change-Id: I8d702a59211de58f912f2a18cb54b6e807c6e457
Oscar Shu [Wed, 30 Jan 2019 10:55:34 +0000 (10:55 +0000)]
Merge "Revert "Wifi MAC Randomization: Developer option change global settings""
Neil Fuller [Wed, 30 Jan 2019 10:53:55 +0000 (10:53 +0000)]
Merge "Track ZygoteHooks API changes in libcore"
Android Build Merger (Role) [Wed, 30 Jan 2019 10:39:45 +0000 (10:39 +0000)]
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
Hyundo Moon [Wed, 30 Jan 2019 10:38:09 +0000 (10:38 +0000)]
Merge "Move Rating and MediaDescription into mainline module"
Adrian Roos [Wed, 30 Jan 2019 10:37:56 +0000 (02:37 -0800)]
[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
Tiger Huang [Wed, 30 Jan 2019 10:36:02 +0000 (10:36 +0000)]
Merge "Let the activity embedded in ActivityView can be directly touched"
Adrian Roos [Wed, 30 Jan 2019 10:31:31 +0000 (02:31 -0800)]
Merge "API: Add missing nullability annotations" am:
e148fbcf03 am:
336e11018e
am:
aaeb5c1201
Change-Id: I0fdde8f76a00a9f019629a71de4a78fb790176d4
Richard Uhler [Wed, 30 Jan 2019 10:29:04 +0000 (10:29 +0000)]
Merge "Rename RollbackInfo.getSessionId to getCommittedSessionId."
Stanislav Zholnin [Wed, 30 Jan 2019 10:19:13 +0000 (10:19 +0000)]
Merge "Adding permission to use DeviceConfig API for AssistantSettings notification service. Permission check will be enforced later."
Adrian Roos [Wed, 30 Jan 2019 10:17:56 +0000 (02:17 -0800)]
Merge "API: Fix missing @NonNull annotations" am:
b852f6636f
am:
d1f5939c1a
Change-Id: I3d0ac8768dcc9c314e235dc679752dd5cbfde0c5
Narayan Kamath [Wed, 30 Jan 2019 10:15:33 +0000 (10:15 +0000)]
Merge "Multi-user support for app data snapshot / rollback."
Zimuzo Ezeozue [Wed, 30 Jan 2019 10:13:41 +0000 (10:13 +0000)]
Merge "Notify PackageHealthObservers of the package versionCode on package failure"
Adrian Roos [Wed, 30 Jan 2019 10:12:37 +0000 (02:12 -0800)]
Merge "API: Add missing nullability annotations" am:
e148fbcf03
am:
336e11018e
Change-Id: Idb6cbb94968f4a2ffe3055291f23fc903fe923a0
Adrian Roos [Wed, 30 Jan 2019 09:55:30 +0000 (01:55 -0800)]
Merge "API: Fix missing @NonNull annotations"
am:
b852f6636f
Change-Id: Id6451f9cd18debf51137a81159ead79064fbafca