OSDN Git Service
Mickey Keeley [Thu, 3 May 2018 16:55:13 +0000 (16:55 +0000)]
Merge "BootParameters: Use new JSON reader"
David Brazdil [Thu, 3 May 2018 16:52:32 +0000 (09:52 -0700)]
[automerger skipped] Merge changes I4e13e5da,I68582cf0,I528a70cc am:
01678299ce am:
e72b4d8001 -s ours
am:
b31c89c62c -s ours
Change-Id: I03c74606caec7de33fee4d0d6c93885b4468529d
android-build-team Robot [Thu, 3 May 2018 16:42:16 +0000 (09:42 -0700)]
Merge "Fix QS edit accessibility." into pi-dev am:
60ea45eb67
am:
c19f890df3
Change-Id: Iafe6cab6b4ef0c2e274a849758a97f084f1314ac
David Brazdil [Thu, 3 May 2018 16:37:59 +0000 (09:37 -0700)]
[automerger skipped] Merge changes I4e13e5da,I68582cf0,I528a70cc am:
01678299ce
am:
e72b4d8001 -s ours
Change-Id: Id5a13a8de6c5cca725e3c42e154248b181dfd814
android-build-team Robot [Thu, 3 May 2018 16:33:57 +0000 (09:33 -0700)]
Merge "Fix QS edit accessibility." into pi-dev
am:
60ea45eb67
Change-Id: I61ea9750162e4ae33e505614670ddb6227003c36
Mike Reed [Thu, 3 May 2018 16:30:43 +0000 (16:30 +0000)]
Merge "remove unused layout method in TestUtils"
David Brazdil [Thu, 3 May 2018 16:29:00 +0000 (09:29 -0700)]
Merge changes I4e13e5da,I68582cf0,I528a70cc
am:
01678299ce
Change-Id: I1bc454cbe71972b04c948c354ccaa7973831b5d0
android-build-team Robot [Thu, 3 May 2018 16:17:36 +0000 (16:17 +0000)]
Merge "Fix QS edit accessibility." into pi-dev
android-build-team Robot [Thu, 3 May 2018 16:10:19 +0000 (09:10 -0700)]
Merge "Make safe label more safe" into pi-dev am:
06637b97dd
am:
118408f6ca
Change-Id: Icfadc3afecb91f12c77712d0b29e961f4414215e
android-build-team Robot [Thu, 3 May 2018 15:55:35 +0000 (08:55 -0700)]
Merge "Make safe label more safe" into pi-dev
am:
06637b97dd
Change-Id: I2ef86d178080bda37dac9afb21c396a76e3f5cec
android-build-team Robot [Thu, 3 May 2018 15:46:10 +0000 (15:46 +0000)]
Merge "Make safe label more safe" into pi-dev
android-build-team Robot [Thu, 3 May 2018 15:44:18 +0000 (08:44 -0700)]
Merge "Dismiss systemui QS dialogs on screen off." into pi-dev am:
31919fb232
am:
c6bc985779
Change-Id: I1784b3441b7088906f9cd0b4d9b80887d434e6c9
Selim Cinek [Thu, 3 May 2018 15:39:26 +0000 (08:39 -0700)]
Merge "Fix new notification showing timestamp "now" after turning off DND" into pi-dev am:
929ea36157
am:
d48aca89b0
Change-Id: I93d5eb4291dcb13e417629f6abb008dc3217e3d0
android-build-team Robot [Thu, 3 May 2018 15:34:38 +0000 (08:34 -0700)]
Merge "Dismiss systemui QS dialogs on screen off." into pi-dev
am:
31919fb232
Change-Id: I65b9b897d09955d0d96f19e6fb5bde9c617a5fd5
Selim Cinek [Thu, 3 May 2018 15:29:56 +0000 (08:29 -0700)]
Merge "Fix new notification showing timestamp "now" after turning off DND" into pi-dev
am:
929ea36157
Change-Id: Ic5e6c30d8219258f3393e237bb0c671de446f9c5
android-build-team Robot [Thu, 3 May 2018 15:23:49 +0000 (15:23 +0000)]
Merge "Dismiss systemui QS dialogs on screen off." into pi-dev
Selim Cinek [Thu, 3 May 2018 15:15:42 +0000 (15:15 +0000)]
Merge "Fix new notification showing timestamp "now" after turning off DND" into pi-dev
Benjamin Miller [Thu, 3 May 2018 14:55:47 +0000 (07:55 -0700)]
Merge "Docs: noted that DISALLOW_INSTALL_APPS prevents DPCs installing apps." into pi-dev am:
297965f29e
am:
fa34b6a997
Change-Id: I28703370d34bd16de607a63c0eaabde2ab37cb65
Nicolas Geoffray [Thu, 3 May 2018 14:46:00 +0000 (07:46 -0700)]
Merge "Add sql methods into light grey." into pi-dev am:
0d659e57b6
am:
686547c0a1
Change-Id: I44248c55bd68ecefc68a94875379f83a4ab3e556
Benjamin Miller [Thu, 3 May 2018 14:41:48 +0000 (07:41 -0700)]
Merge "Docs: noted that DISALLOW_INSTALL_APPS prevents DPCs installing apps." into pi-dev
am:
297965f29e
Change-Id: I57d55527a6e6019a3310536df49ee8fb28d8780c
android-build-team Robot [Thu, 3 May 2018 14:35:41 +0000 (07:35 -0700)]
Merge "WIDGET_TYPE_UNSELECTABLE_TEXTVIEW is missing in the WidgetType" into pi-dev am:
d733159b45
am:
d948b2cb63
Change-Id: I3084f6cd947f6687c425e8403fc10b602464414f
Nicolas Geoffray [Thu, 3 May 2018 14:35:41 +0000 (07:35 -0700)]
Merge "Add sql methods into light grey." into pi-dev
am:
0d659e57b6
Change-Id: I0f58a9f021e234f1fc08060ea4d5a29e08874d0b
android-build-team Robot [Thu, 3 May 2018 14:16:34 +0000 (07:16 -0700)]
Merge "WIDGET_TYPE_UNSELECTABLE_TEXTVIEW is missing in the WidgetType" into pi-dev
am:
d733159b45
Change-Id: I861a4191125f75efa306ee500f1bf1edc775ab38
android-build-team Robot [Thu, 3 May 2018 14:16:11 +0000 (07:16 -0700)]
Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev am:
0d58b9bb64
am:
63180005bb
Change-Id: Ib584f14ae26d3b0ded27d80cab9a408699017e6a
David Brazdil [Thu, 3 May 2018 14:15:13 +0000 (14:15 +0000)]
Merge changes I4e13e5da,I68582cf0,I528a70cc
* changes:
Remove hiddenapi-blacklist.txt
Update hiddenapi-p-light-greylist.txt
Add rule to build hidden API blacklist
Benjamin Miller [Thu, 3 May 2018 14:08:54 +0000 (14:08 +0000)]
Merge "Docs: noted that DISALLOW_INSTALL_APPS prevents DPCs installing apps." into pi-dev
Nicolas Geoffray [Thu, 3 May 2018 14:08:50 +0000 (14:08 +0000)]
Merge "Add sql methods into light grey." into pi-dev
android-build-team Robot [Thu, 3 May 2018 14:06:35 +0000 (07:06 -0700)]
Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev
am:
0d58b9bb64
Change-Id: I158c05e9bd15f9dda46bbcb09a313d7932d72c02
android-build-team Robot [Thu, 3 May 2018 14:06:33 +0000 (07:06 -0700)]
Merge "Revert "Update 'dnd is hiding notifications' view"" into pi-dev am:
aeaefe91bc
am:
57d0060786
Change-Id: I7821e55c3b1495b65b4467ab8511a643c862919f
android-build-team Robot [Thu, 3 May 2018 14:05:00 +0000 (14:05 +0000)]
Merge "WIDGET_TYPE_UNSELECTABLE_TEXTVIEW is missing in the WidgetType" into pi-dev
android-build-team Robot [Thu, 3 May 2018 13:57:29 +0000 (06:57 -0700)]
Merge "Revert "Update 'dnd is hiding notifications' view"" into pi-dev
am:
aeaefe91bc
Change-Id: Iea5f5229e8acef6985559fe2459b4ee755b636b7
android-build-team Robot [Thu, 3 May 2018 13:55:38 +0000 (13:55 +0000)]
Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev
android-build-team Robot [Thu, 3 May 2018 13:48:01 +0000 (06:48 -0700)]
Merge "old paths contains all entries when updating" into pi-dev am:
f5cb5e5525
am:
9cfb90e85b
Change-Id: I63f21a16b8e5f59c1fd6cefb242b8b22dd564eaa
android-build-team Robot [Thu, 3 May 2018 13:46:56 +0000 (13:46 +0000)]
Merge "Revert "Update 'dnd is hiding notifications' view"" into pi-dev
android-build-team Robot [Thu, 3 May 2018 13:39:29 +0000 (06:39 -0700)]
Merge "old paths contains all entries when updating" into pi-dev
am:
f5cb5e5525
Change-Id: I13b2118b834e9f255c83cf737ae1d9e8d93c9245
android-build-team Robot [Thu, 3 May 2018 13:26:50 +0000 (13:26 +0000)]
Merge "old paths contains all entries when updating" into pi-dev
Richard Uhler [Thu, 3 May 2018 13:21:52 +0000 (06:21 -0700)]
Merge "Fix leak of WeakReferences on mThemeRefs list." into pi-dev am:
7790f2a4e1
am:
9413533125
Change-Id: Ia626ee1d5975ead16e5fe487d8b35ccbfde39443
Richard Uhler [Thu, 3 May 2018 13:13:07 +0000 (06:13 -0700)]
Merge "Fix leak of WeakReferences on mThemeRefs list." into pi-dev
am:
7790f2a4e1
Change-Id: Ia6d0946520165519c2256ab0714a216ac495d45f
Richard Uhler [Thu, 3 May 2018 13:02:35 +0000 (13:02 +0000)]
Merge "Fix leak of WeakReferences on mThemeRefs list." into pi-dev
Nicolas Geoffray [Thu, 3 May 2018 12:41:10 +0000 (05:41 -0700)]
Merge "Add IWindowManager.setAnimationScales to light grey." into pi-dev am:
91a14dec3c
am:
3c1b3cacc3
Change-Id: I6681ada5065bc9e43f11265d11f69022acfdc66a
Julia Reynolds [Thu, 3 May 2018 12:40:20 +0000 (12:40 +0000)]
Revert "Update 'dnd is hiding notifications' view"
This reverts commit
85bad9b5bbbf2d974ad597963ae1bab87c60faf0.
Change-Id: Ic68475a8df0ae377c4fc357017b7d2a6b5311433
Fixes:
79155510
Fixes:
79156480
Erik Kline [Thu, 3 May 2018 12:31:28 +0000 (05:31 -0700)]
Merge "[automerger skipped] Merge "Add static IpClient logging" am:
8285261133 am:
d81625a7a9 -s ours" into pi-dev-plus-aosp
am:
3140998fed -s ours
Change-Id: I88ce48c5842a6a3da50aa86341d21e4566194e2e
Nicolas Geoffray [Thu, 3 May 2018 12:23:44 +0000 (05:23 -0700)]
Merge "More light grey apis." into pi-dev am:
eb368af5b0
am:
2a47deed31
Change-Id: I5727fca1c950da9ef0c5bf34af30181ee1e906c9
Nicolas Geoffray [Thu, 3 May 2018 12:19:56 +0000 (05:19 -0700)]
Merge "Add IWindowManager.setAnimationScales to light grey." into pi-dev
am:
91a14dec3c
Change-Id: I6acaab5436c5bfc0e9f5bedce7c3974bb1b756b1
Android Build Merger (Role) [Thu, 3 May 2018 12:15:58 +0000 (12:15 +0000)]
Merge "[automerger skipped] Merge "Add static IpClient logging" am:
8285261133 am:
d81625a7a9 -s ours" into pi-dev-plus-aosp
Erik Kline [Thu, 3 May 2018 12:15:34 +0000 (05:15 -0700)]
[automerger skipped] Merge "Add static IpClient logging" am:
8285261133
am:
d81625a7a9 -s ours
Change-Id: If8e8dc57346e315462c4a6ff020f7dee16115d76
Nicolas Geoffray [Thu, 3 May 2018 12:14:53 +0000 (05:14 -0700)]
Merge "More light grey apis." into pi-dev
am:
eb368af5b0
Change-Id: Id9952a143670b739becf3d45d2ef2f8dee6266c6
Nicolas Geoffray [Thu, 3 May 2018 12:08:14 +0000 (12:08 +0000)]
Merge "Add IWindowManager.setAnimationScales to light grey." into pi-dev
Erik Kline [Thu, 3 May 2018 12:05:05 +0000 (05:05 -0700)]
Merge "Add static IpClient logging"
am:
8285261133
Change-Id: Id566002382162a848de91b85559e69bc6f7ea28d
Nicolas Geoffray [Thu, 3 May 2018 12:04:21 +0000 (12:04 +0000)]
Merge "More light grey apis." into pi-dev
Benjamin Miller [Thu, 3 May 2018 10:56:28 +0000 (10:56 +0000)]
Docs: noted that DISALLOW_INSTALL_APPS prevents DPCs installing apps.
Bug:
72428023
Test: make ds-docs and inspect output
Change-Id: Ifc31378b7061d10b73de183e3c64864d608975b1
David Brazdil [Thu, 3 May 2018 09:57:45 +0000 (10:57 +0100)]
Remove hiddenapi-blacklist.txt
Create an empty file in the build rule instead. Do not merged this
beyond AOSP. We have an implicitly built blacklist everywhere else.
Bug:
64382372
Test: make
Change-Id: I4e13e5daf635934a152d389a95bf45c482b5a87f
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Todd Kennedy [Thu, 3 May 2018 09:05:04 +0000 (10:05 +0100)]
Make safe label more safe
* limit the absolute maximum size of the label to 50000 characters
[which is probably far more than necessary, but, can be dialed down]
* use a string buffer while processing the string [instead of creating
multiple string objects]
Bug:
62537081
Test: Manual. Install APK in bug and see that it can be uninstalled
Change-Id: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
Erik Kline [Thu, 3 May 2018 10:44:30 +0000 (10:44 +0000)]
Merge "Add static IpClient logging"
android-build-team Robot [Thu, 3 May 2018 10:24:51 +0000 (03:24 -0700)]
Merge "Turn on QuickStep onboarding" into pi-dev am:
5ab7aa816e
am:
f2c7c9ddf5
Change-Id: Ib6178967729091fea8fe6149b798b0f35ebdc4c3
android-build-team Robot [Thu, 3 May 2018 10:16:20 +0000 (03:16 -0700)]
Merge "Turn on QuickStep onboarding" into pi-dev
am:
5ab7aa816e
Change-Id: Ida6d4731bb5aeb860a8847d1fd7c71cf197c3a29
android-build-team Robot [Thu, 3 May 2018 10:08:23 +0000 (10:08 +0000)]
Merge "Turn on QuickStep onboarding" into pi-dev
Todd Kennedy [Wed, 2 May 2018 09:59:45 +0000 (10:59 +0100)]
old paths contains all entries when updating
In certains circumstances, only the base and split APKs were included in
the "old paths" list when updating the application info. Instead, this
list should contain _all_ elements, including any additional libraries
that may be added to the overall classpath.
Bug:
77342775
Test: Manual. Install a package. Install a split with --dont_kill. See that the path doesn't contain duplicate entries
Change-Id: Id9739cce215ab07bff1b17966583c0cf51a0b34a
android-build-team Robot [Thu, 3 May 2018 10:00:13 +0000 (03:00 -0700)]
Merge "Fixes non-matching instant app behavior" into pi-dev am:
8d9f844004
am:
f1c0afab02
Change-Id: I75fd84373b472e269f0c1ae5bb4473e0a763eb9e
David Brazdil [Thu, 3 May 2018 09:55:34 +0000 (10:55 +0100)]
Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I68582cf087b2e92f10b86c7c5a8bcd095e80ffab
David Brazdil [Wed, 2 May 2018 14:47:32 +0000 (15:47 +0100)]
Add rule to build hidden API blacklist
Add a new Makefile rule 'hiddenapi-b-blacklist' which takes the
manually published hiddenapi-p-light-greylist.txt and subtracts it
from private-dex.txt built for the current branch. This is meant to
provide an approximation of the blacklist in internal branches.
Bug:
64382372
Test: make hiddenapi-aosp-blacklist
Change-Id: I528a70cc6a71e988b53d94ca7ef81d6c181e5153
android-build-team Robot [Thu, 3 May 2018 09:51:05 +0000 (02:51 -0700)]
Merge "Fixes non-matching instant app behavior" into pi-dev
am:
8d9f844004
Change-Id: Ic61ea35272cbf2d2e544f6aa3f7463f44de89ad0
android-build-team Robot [Thu, 3 May 2018 09:36:52 +0000 (09:36 +0000)]
Merge "Fixes non-matching instant app behavior" into pi-dev
android-build-team Robot [Thu, 3 May 2018 09:27:25 +0000 (09:27 +0000)]
Merge "Complete cleanup broadcast receivers of target user"
Richard Uhler [Thu, 26 Apr 2018 14:09:30 +0000 (15:09 +0100)]
Fix leak of WeakReferences on mThemeRefs list.
Periodically remove references from the list whose referents have been
garbage collected.
Bug:
73961798
Test: Device boots.
Test: Take a heap dump of systemui and manually check that the state of
ThemeRefs looks reasonable.
Change-Id: I691027feb5dd217bcb60406b28897b9614e2a845
Erik Kline [Tue, 1 May 2018 07:51:44 +0000 (16:51 +0900)]
Add static IpClient logging
Support keeping IpClient logs around and dumping them
during dumpsys. Previously we got this benefit for
wifi by virtue of WifiStateMachine's long-lived nature.
Now that this is changing we need to be sure we have
logs, and this method gets us Ethernet logs as well.
Bug:
62476366
Bug:
77999594
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- dumpsys connmetrics [ipclient] works
Merged-In: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Merged-In: Ie947394fabcaca7fc1d067f095c2442ee2704593
Change-Id: I1136a83de8097fdb4130debe1eaf689be7132fe5
(cherry picked from commit
3f8306b8c56b58054800a576912204e8bf66f9f4)
android-build-team Robot [Thu, 3 May 2018 08:38:26 +0000 (01:38 -0700)]
Merge "Add static IpClient logging" into pi-dev am:
5402b60bfa
am:
820108a36c
Change-Id: Ie947394fabcaca7fc1d067f095c2442ee2704593
Nicolas Geoffray [Thu, 3 May 2018 08:32:44 +0000 (09:32 +0100)]
Add sql methods into light grey.
bug:
79147309
Test: m
Change-Id: Ia986d123e1e87489fec98e2d16c94b74119696c4
Mathew Inwood [Thu, 3 May 2018 08:30:30 +0000 (01:30 -0700)]
Merge "Pass package name to runtime." into pi-dev am:
e9db89cc76
am:
c83131679c
Change-Id: Ib2ef1b2ed28ed017de517db519b0b81f34db395d
android-build-team Robot [Thu, 3 May 2018 08:30:22 +0000 (01:30 -0700)]
Merge "Add static IpClient logging" into pi-dev
am:
5402b60bfa
Change-Id: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Mathew Inwood [Thu, 3 May 2018 08:21:40 +0000 (01:21 -0700)]
Merge "Pass package name to runtime." into pi-dev
am:
e9db89cc76
Change-Id: I4b64ad026f53dc2abbf36017b425c70c74ad0a91
android-build-team Robot [Thu, 3 May 2018 08:19:43 +0000 (08:19 +0000)]
Merge "Add static IpClient logging" into pi-dev
Mathew Inwood [Thu, 3 May 2018 08:12:02 +0000 (08:12 +0000)]
Merge "Pass package name to runtime." into pi-dev
Eric Hsu [Thu, 3 May 2018 07:32:41 +0000 (07:32 +0000)]
Merge "Instantly excute next state when the agent provides a prohibited key."
android-build-team Robot [Thu, 3 May 2018 04:32:20 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Thu, 3 May 2018 04:31:12 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Thu, 3 May 2018 04:29:03 +0000 (04:29 +0000)]
Merge "Import translations. DO NOT MERGE"
ericchhsu [Mon, 23 Apr 2018 08:38:25 +0000 (16:38 +0800)]
Instantly excute next state when the agent provides a prohibited key.
When the agent provides a prohibited key, the code flow will directly be returned
without excuting next backup state. The next state should be execute instantly to
make sure the backup mechanism can be executed properly.
Bug:
77272601
Test: 1.m -j RunFrameworksServicesRoboTests
2.Manual testing by test package with prohibited key.
- adb backup -all
- adb backup -shared
- adb backup -obb -all
- adb shell bmgr backupnow --all
- adb shell bmgr backupnow [test key value package]
- adb backup -keyvalue [test key value package]
Change-Id: I46e1aa8dd0f75cf54087b43cee50ee952d85abc1
shawnlin [Wed, 2 May 2018 09:02:54 +0000 (17:02 +0800)]
Fix new notification showing timestamp "now" after turning off DND
DateTimeView won't update timestamp until the view is attached to
window and received TIME_TICK intent.
Update timestamp on onAttachedToWindow().
Test: manual 1) turn on DND 2) send a notification and wait some time 3)
turn off DND and check the timestamp
Fixes:
77970557
Change-Id: Ia8420aacf5b91b0bb9cbec561629ddbfc8de4f67
Felipe Leme [Thu, 3 May 2018 02:57:19 +0000 (02:57 +0000)]
Merge "Minor refactorings on Autofill tests:"
Shaowei Shen [Thu, 3 May 2018 02:24:29 +0000 (19:24 -0700)]
Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev am:
49a987c277
am:
661afbe5fa
Change-Id: Ia242afee49f7c715ba0b6fa65a4325b89e26f79d
Shaowei Shen [Thu, 3 May 2018 02:17:34 +0000 (19:17 -0700)]
Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev
am:
49a987c277
Change-Id: I74ab1b5d58d1daf58284a648daf7c5ff72ed0a49
Tracy Zhou [Thu, 3 May 2018 02:10:33 +0000 (19:10 -0700)]
Merge "Update QuickScrub tip according to the latest spec." into pi-dev am:
63b6275a2b
am:
379e333a25
Change-Id: I0db38ffc453c0c1be62c9de8215aa84e7d0a38b5
Shaowei Shen [Thu, 3 May 2018 02:05:17 +0000 (02:05 +0000)]
Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev
android-build-team Robot [Thu, 3 May 2018 01:59:41 +0000 (18:59 -0700)]
Merge "Fix a condition to reset the current spell checker" into pi-dev am:
18f730cc00
am:
4c08f66de9
Change-Id: If6622922ca7f18fed9dea7653b22baef2dda88a6
android-build-team Robot [Thu, 3 May 2018 01:43:57 +0000 (18:43 -0700)]
Merge "Quickscrub will hide the most right buttons on nav bar" into pi-dev am:
56f39770ea
am:
69d647d311
Change-Id: I18a439f9f29cf7fad81ab2bf0dff46207c11e4f8
android-build-team Robot [Thu, 3 May 2018 01:31:01 +0000 (18:31 -0700)]
Merge "Fix a race in spell checker session handling" into pi-dev am:
bca85a0d44
am:
afced7cd7b
Change-Id: I1d07480ef631d3bc08253e09a88770dc3f4ce528
android-build-prod (mdb) [Thu, 3 May 2018 01:26:07 +0000 (18:26 -0700)]
[automerger skipped] Merge "don't block adb while running uninstall" am:
17280c61d3 am:
76ef10f320 -s ours
am:
db5fac97ae -s ours
Change-Id: I19303136cc2f813a3ec4e7951fee48a3900915ba
Yi Jin [Thu, 3 May 2018 01:20:38 +0000 (18:20 -0700)]
[automerger skipped] Merge "Add a section flag to bypass failure if a specific path can't be found." into pi-dev am:
e09cde0cd9
am:
68a16c4277 -s ours
Change-Id: Ifb3d550724acf2eea7e676e229912c4cbfe7080b
Farid Zare Seisan [Thu, 3 May 2018 01:15:17 +0000 (18:15 -0700)]
Merge "UserDataPrepare: CE storage property set too early." into pi-dev am:
85c7a9a113
am:
3a419327ea
Change-Id: I9b3c765d04c42bc55e832531b48048746feb9466
Tracy Zhou [Thu, 3 May 2018 01:13:04 +0000 (18:13 -0700)]
Merge "Update QuickScrub tip according to the latest spec." into pi-dev
am:
63b6275a2b
Change-Id: I177be0db1396681b879b1d5c9c8bbad86d59d030
Jeff Sharkey [Thu, 3 May 2018 01:10:07 +0000 (18:10 -0700)]
Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev am:
f7d3e028ae
am:
1394fd25ca
Change-Id: If6904b6dc431dab74e326b75f37b58ee3c99feef
android-build-team Robot [Thu, 3 May 2018 01:05:11 +0000 (18:05 -0700)]
Merge "Preventing zombie process creation." into pi-dev am:
ca6f36532d
am:
193c893b01
Change-Id: Id32203ab069343410a02c03956a7c6135f8a1b33
Tracy Zhou [Thu, 3 May 2018 01:01:58 +0000 (01:01 +0000)]
Merge "Update QuickScrub tip according to the latest spec." into pi-dev
Selim Cinek [Thu, 3 May 2018 00:57:14 +0000 (17:57 -0700)]
Merge "Fix incorrect icon alignment on shelf" into pi-dev am:
33540449fc
am:
5a647deab3
Change-Id: I7741ad0635a4ba46eab29718b9e2bfed5f307f9f
Ryan Mitchell [Thu, 3 May 2018 00:49:08 +0000 (17:49 -0700)]
Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev am:
150bafd217
am:
cc6e856522
Change-Id: Ie22b644b07da19fcc51e59529f5e38ee2f1f9137
Lucas Dupin [Thu, 3 May 2018 00:39:29 +0000 (17:39 -0700)]
Merge "Fix NPE when casting" into pi-dev am:
9115d371c3
am:
40ee4178f4
Change-Id: I348116fdb5e6ebe5f9c72c53643d4a0d38bafe6f
android-build-team Robot [Thu, 3 May 2018 00:28:38 +0000 (17:28 -0700)]
Merge "Fix a condition to reset the current spell checker" into pi-dev
am:
18f730cc00
Change-Id: If53849072e284f05589804a26caee621305fa797
android-build-team Robot [Thu, 3 May 2018 00:26:55 +0000 (17:26 -0700)]
Merge "Invoke create_recording_canvas correctly in macro bench tests" into pi-dev am:
f28901f6c5
am:
72b1215615
Change-Id: Ic704d134a33bb9cfbda2ae88fce3571bda5176fa
android-build-team Robot [Thu, 3 May 2018 00:14:23 +0000 (00:14 +0000)]
Merge "Fix a condition to reset the current spell checker" into pi-dev
OSDN Git Service
