OSDN Git Service
Lucas Dupin [Thu, 7 Jun 2018 21:22:23 +0000 (14:22 -0700)]
Merge "Hide backdrop when waking up from fp" into pi-dev
am:
e752b75dad
Change-Id: I9ae8dc2caea8ca9cf3b0936cb094e24d4b82c440
shawnlin [Thu, 7 Jun 2018 21:17:33 +0000 (14:17 -0700)]
Merge "Fixed flickering when quick tap on brightness bar" into pi-dev
am:
0631de5772
Change-Id: Ib794cc43160067916970c04beef3a04ad1d6fb3e
Benjamin Miller [Thu, 7 Jun 2018 21:06:07 +0000 (14:06 -0700)]
Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
am:
d97f38f69c
Change-Id: Ie5880f548d07e2e73f78e22f26134aeb6cf2dfe5
TreeHugger Robot [Thu, 7 Jun 2018 20:40:33 +0000 (20:40 +0000)]
Merge "Hide backdrop when waking up from fp" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 20:28:36 +0000 (20:28 +0000)]
Merge "Fixed flickering when quick tap on brightness bar" into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 20:18:28 +0000 (13:18 -0700)]
Merge "Add more APIs to light grey list" into pi-dev
am:
208c0ad30f
Change-Id: Iffdbfe98799a8e148bb74736fec4d7f687a68693
Benjamin Miller [Thu, 7 Jun 2018 20:12:43 +0000 (20:12 +0000)]
Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
Chad Brubaker [Thu, 7 Jun 2018 20:10:17 +0000 (13:10 -0700)]
Merge "Do not preload NoPreloadHolder classes" into pi-dev
am:
1af8b4d1f4
Change-Id: I9ef5f466c06630d868d178aa0633616e43d0e2e8
Nicolas Geoffray [Thu, 7 Jun 2018 20:03:42 +0000 (20:03 +0000)]
Merge "Add more APIs to light grey list" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 19:48:14 +0000 (19:48 +0000)]
Merge "Do not preload NoPreloadHolder classes" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 19:45:08 +0000 (19:45 +0000)]
Merge "Change roboto-->sans-serif-regular" into pi-wear-dev
Nicolas Geoffray [Thu, 7 Jun 2018 19:42:43 +0000 (12:42 -0700)]
Merge "One more light grey addition." into pi-dev
am:
ff207fdf86
Change-Id: Icc88807c2fcf8b94310778a024254ddeef751c3b
TreeHugger Robot [Thu, 7 Jun 2018 19:11:12 +0000 (19:11 +0000)]
Merge "One more light grey addition." into pi-dev
Winson Chung [Thu, 7 Jun 2018 19:09:21 +0000 (12:09 -0700)]
Merge "Consider window background opacity when determining snapshot translucency" into pi-dev
am:
c6e4acc222
Change-Id: Id601265dab518fd722b24dac222e86f63fb5dec5
Winson Chung [Thu, 7 Jun 2018 18:59:48 +0000 (18:59 +0000)]
Merge "Consider window background opacity when determining snapshot translucency" into pi-dev
Chad Brubaker [Thu, 7 Jun 2018 18:40:57 +0000 (11:40 -0700)]
Do not preload NoPreloadHolder classes
These classes cannot be statically preloaded in Zygote.
Change-Id: I7d9f10e634409bedfdd71f8daa43b8e23516638e
Fixes:
109652611
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testCaCertManagement
Winson Chung [Thu, 7 Jun 2018 18:46:47 +0000 (11:46 -0700)]
Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev
am:
5d4678e992
Change-Id: Ifaad73b221c8c1745245203fc26e38b2a9d00884
Anthony Hugh [Thu, 7 Jun 2018 18:40:10 +0000 (11:40 -0700)]
Change roboto-->sans-serif-regular
BUG:
71634382
Change-Id: Ifb32031b511771e9261c1307f7e73f1e94851648
TreeHugger Robot [Thu, 7 Jun 2018 18:25:14 +0000 (18:25 +0000)]
Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev
Laura Davis [Thu, 7 Jun 2018 18:24:36 +0000 (11:24 -0700)]
Merge "docs: Changed language to be gender-neutral." into pi-dev
am:
b6e3e61850
Change-Id: I5ffd2578d710893f90e837db60238c37fa89e4e0
Laura Davis [Thu, 7 Jun 2018 18:04:16 +0000 (18:04 +0000)]
Merge "docs: Changed language to be gender-neutral." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 17:59:40 +0000 (17:59 +0000)]
Merge "Fix toast for wearables" into pi-wear-dev
Nicolas Geoffray [Thu, 7 Jun 2018 17:30:49 +0000 (10:30 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
ac013ae464
Change-Id: Ib1fcb11948bd9fb3d53f1a059e54b496d2e6ba76
Nicolas Geoffray [Thu, 7 Jun 2018 17:23:21 +0000 (18:23 +0100)]
One more light grey addition.
bug:
109833930
Test: m
Change-Id: I0f2079e84827f1ee6425e5a73a135d2401a78443
TreeHugger Robot [Thu, 7 Jun 2018 17:18:33 +0000 (17:18 +0000)]
Merge "DO NOT MERGE Don't hide IME when keyguard is just occluded." into pi-wear-dev
TreeHugger Robot [Thu, 7 Jun 2018 17:18:27 +0000 (17:18 +0000)]
Merge "DO NOT MERGE Allow windows to show when input restricted." into pi-wear-dev
Pavel Grafov [Thu, 7 Jun 2018 17:17:08 +0000 (10:17 -0700)]
Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev
am:
8e0ad6534d
Change-Id: Ibddf85d6ebe1e499a54e0e0c047365ecf81e15c2
Nicolas Geoffray [Thu, 7 Jun 2018 17:14:20 +0000 (17:14 +0000)]
Merge "Add more light grey APIs." into pi-dev
Lucas Dupin [Thu, 7 Jun 2018 17:12:32 +0000 (10:12 -0700)]
Merge "Update scrims when keyguard gets occluded" into pi-dev
am:
cc4efe08de
Change-Id: Ic778018318b89285bc368d6c43aac5b5d211fd9a
Yi Jin [Thu, 7 Jun 2018 17:06:54 +0000 (10:06 -0700)]
Merge "Fix cts." into pi-dev
am:
3e389a8490
Change-Id: I77fcff1e83f33859e0b0cb65a29bfa40827749a9
TreeHugger Robot [Thu, 7 Jun 2018 16:56:25 +0000 (16:56 +0000)]
Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 16:50:34 +0000 (16:50 +0000)]
Merge "Update scrims when keyguard gets occluded" into pi-dev
Yi Jin [Thu, 7 Jun 2018 16:48:20 +0000 (16:48 +0000)]
Merge "Fix cts." into pi-dev
Andrew Sapperstein [Thu, 7 Jun 2018 16:29:35 +0000 (09:29 -0700)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
am:
bae9b1a71c
Change-Id: If57cc74f41f7294780c0f6f3d534b1c7af877d38
Andrew Sapperstein [Thu, 7 Jun 2018 16:15:57 +0000 (16:15 +0000)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
David Brazdil [Thu, 7 Jun 2018 15:32:41 +0000 (16:32 +0100)]
Add more APIs to light grey list
Bug:
109869624
Test: m
Change-Id: I3490b8cfba60f0be0c3d464b581ccca637af0549
Nicolas Geoffray [Thu, 7 Jun 2018 15:29:48 +0000 (08:29 -0700)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
am:
cc2cbe8dc8
Change-Id: I4b817ff598eea893eb78d9fdfd7f322176850cc2
Nicolas Geoffray [Thu, 7 Jun 2018 15:18:24 +0000 (15:18 +0000)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
Daniel Sandler [Thu, 7 Jun 2018 14:23:27 +0000 (07:23 -0700)]
Merge "O no, this should be a P." into pi-dev
am:
31cb11324f
Change-Id: I7392d863c935ab64fc6445fca4c3b35352ffcf1f
Daniel Sandler [Thu, 7 Jun 2018 14:14:03 +0000 (14:14 +0000)]
Merge "O no, this should be a P." into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 10:50:02 +0000 (11:50 +0100)]
Manual update from a bugbot hidden API comment.
bug:
109761368
Test: m
Change-Id: I65cda12a0c4e48c888d3b08f63f9412b88ac248a
Nicolas Geoffray [Thu, 7 Jun 2018 08:01:23 +0000 (09:01 +0100)]
Add more light grey APIs.
bug:
109841601
Test: m
Change-Id: I6f43c718a35a534f1b675cc116f2642e6a5b8a18
Merged-in: I6f43c718a35a534f1b675cc116f2642e6a5b8a18
Pavel Grafov [Wed, 6 Jun 2018 15:11:09 +0000 (16:11 +0100)]
Start SecurityLogMonitor after broadcasts are allowed.
Otherwise if boot takes long enough, DO broadcast will be sent while
ActivityManagerSerivce is not ready, causing IllegalStateException.
Change-Id: I6b55ed45ed7b1f3ed9ad6ec20695907b4fa6f3b1
Fixes:
109746888
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.DeviceOwnerTest#testSecurityLoggingWithSingleUser
Test: provisioned TestDPC as DO in SuW, enabled logging.
Ryan Mitchell [Thu, 7 Jun 2018 06:05:27 +0000 (23:05 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours am:
35dfd46378 -s ours
am:
a76360ddf1 -s ours
Change-Id: I91dddfd8a038bcd353769b7173e2864caab2d046
Ryan Mitchell [Thu, 7 Jun 2018 05:52:56 +0000 (22:52 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8 am:
366031e336
am:
5dcf0e0f65
Change-Id: I5caded1c61d9e0a45b9aaa4db37493b2cd1a6c2b
Ryan Mitchell [Thu, 7 Jun 2018 05:24:04 +0000 (22:24 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours
am:
35dfd46378 -s ours
Change-Id: Icc7661bca07e16f0b230b35ab7f1df8f0d8a8189
Dan Sandler [Thu, 7 Jun 2018 05:08:34 +0000 (01:08 -0400)]
O no, this should be a P.
Bug:
109804872
Test: none
Change-Id: Ibd6aac069a254a7d5a190e1f4476ba2c4124a758
Ryan Mitchell [Thu, 7 Jun 2018 04:26:05 +0000 (21:26 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8
am:
366031e336
Change-Id: I815ba23c884d6891b2acba23687db0d4d1cab98a
Ryan Mitchell [Thu, 7 Jun 2018 04:19:51 +0000 (21:19 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac
am:
53ff808f99 -s ours
Change-Id: Ia9736d803a7b980bafb5b55d76c99a7ee29c68c3
Ryan Mitchell [Thu, 7 Jun 2018 03:49:18 +0000 (20:49 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8
am:
dff068e1e8
Change-Id: I562e53f089ca19fc145a34fb539556ae92d05722
Winson Chung [Mon, 4 Jun 2018 23:40:09 +0000 (16:40 -0700)]
Consider window background opacity when determining snapshot translucency
Bug:
80536978
Test: Open WhatsApp conversation with IME open, hit home, go to Overview
Change-Id: I14cb15a15c2dc43229c927eda4bad3d61e568622
shawnlin [Mon, 28 May 2018 08:29:08 +0000 (16:29 +0800)]
Fixed flickering when quick tap on brightness bar
Reduce the height of brightness mirror view.
Change-Id: I998932dea51659cbba0a8484973b3281f595c46e
Fixes:
79927315
Test: quick tap on brightness bar and observe the result
Test: atest google/perf/jank/SystemUI/UbSystemUIJankTests-Trace:android.platform.systemui.tests.jank.SystemUiJankTests#testChangeBrightness
Winson Chung [Wed, 6 Jun 2018 16:34:23 +0000 (09:34 -0700)]
Only use the pre-animation bounds when an animation is running and is set
- Fix issue with NaN being calculated as the saved fraction due to the wrong
bounds being used
Bug:
109841835
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests
Test: Repeatedly launch pip into fullscreen landscape app, and ensure that
the saved snapfraction is calculated correctly
Change-Id: I9b442cda636121164af1f3e66050894d06518439
Felipe Leme [Thu, 7 Jun 2018 02:03:05 +0000 (19:03 -0700)]
Merge "Document -n option on intent specification." into pi-dev
am:
39f04a7da4
Change-Id: Ida1118dcb4690b9e5067ee781d2b32131231681c
Ryan Mitchell [Thu, 7 Jun 2018 01:53:39 +0000 (18:53 -0700)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
am:
2d31069fac
Change-Id: I282ef1b63da084bb0906bee79ec5a7b0e9e66a2c
Winson Chung [Thu, 7 Jun 2018 01:53:11 +0000 (18:53 -0700)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
am:
fc16950683
Change-Id: I8f84ad12fb662e2b5d97b4de118697dadb51bac8
Amith Yamasani [Thu, 7 Jun 2018 01:44:08 +0000 (18:44 -0700)]
Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
am:
9f1885dee8
Change-Id: I292370dc2fcf4b33e42c5a97a9d5d5bacfe0def8
Ryan Mitchell [Thu, 7 Jun 2018 01:30:51 +0000 (18:30 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev
am:
075bcf73c8
Change-Id: I926986b532e52b423555f9fb6540ccfe50eee075
Yi Jin [Thu, 7 Jun 2018 01:08:01 +0000 (18:08 -0700)]
Fix cts.
Bug:
109837886
Test: atest CtsIncidentHostTestCases:com.android.server.cts.IncidentdTest
Change-Id: I8cfc36b652fff4b7b4d752f57fba922ac479cd12
Felipe Leme [Thu, 7 Jun 2018 01:06:47 +0000 (18:06 -0700)]
Merge "Minor autofill logging improvements." into pi-dev
am:
125c19a2f5
Change-Id: I99a127c2f17284f6aeefd19814779c17a46f5bfd
Nan Zhang [Thu, 7 Jun 2018 00:41:49 +0000 (17:41 -0700)]
Merge "Add metalava-api-stubs targets" into pi-dev
am:
a08d1ffbb7
Change-Id: I87d04989509b96eeb8d97fcbdfb1102c55b0d8f8
TreeHugger Robot [Thu, 7 Jun 2018 00:36:10 +0000 (00:36 +0000)]
Merge "Document -n option on intent specification." into pi-dev
Winson Chung [Thu, 7 Jun 2018 00:35:54 +0000 (00:35 +0000)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
Ryan Mitchell [Thu, 7 Jun 2018 00:35:24 +0000 (17:35 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev am:
2b6805fedc
am:
5ae85666ac
Change-Id: I32a1adb783012b0d799aa849f2f989377d3cdbad
Andrew Zeng [Fri, 13 Oct 2017 22:49:53 +0000 (15:49 -0700)]
DO NOT MERGE Don't hide IME when keyguard is just occluded.
Occluded can be true even when keyguard isn't showing, so an IME might
be hidden if it's attempted to be shown while keyguard isn't up.
Because of changes made in ag/
3022559, when keyguard is occluded and
it's in use, it will now actually report as "showing" rather than not
showing in order to match the phone behavior, so this shouldn't have
any side effects.
Bug:
72027687
Change-Id: Ie570b9574c9b22452649a9b044853609476bfa91
Andrew Zeng [Tue, 12 Sep 2017 22:34:10 +0000 (15:34 -0700)]
DO NOT MERGE Allow windows to show when input restricted.
Allows non-activity windows to show instead of being hidden (e.g IME)
when lock screen is not showing. This is a difference from current
behavior in G when:
1. The device is not interactive (either of AoD-on/-off).
2. The device is interactive and isInputRestricted is true.
This allows for consistency w/ activity manager on allowing IME to be
visible whenever an activity is allowed to be visible (w/o special flags).
Bug:
72027687
Change-Id: I082babcdd4e2ca1c3188da9d43589b1d34fb70c8
(cherry picked from commit
13331922827edd3a0135a1a1be8ac505716f106a)
Mihai Popa [Wed, 6 Jun 2018 23:57:53 +0000 (16:57 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours am:
ac169beb52 -s ours am:
4ae55000b2 -s ours
am:
c69da1474a -s ours
Change-Id: I66a97b7defc39ec06069dcea88d1a19aa5123d90
Evan Laird [Wed, 6 Jun 2018 23:45:10 +0000 (16:45 -0700)]
Merge "Status bar etc dots 4dp" into pi-dev
am:
d54c3a3036
Change-Id: I9038fb861e7a543f7082c4b186f0c77eb352e204
Dieter Hsu [Wed, 6 Jun 2018 23:41:05 +0000 (16:41 -0700)]
Merge "Update notifications on density or font size change for current user" into pi-dev
am:
1394b342e3
Change-Id: I21abde95764da24626a6c367465df7f8e653119e
Lucas Dupin [Wed, 6 Jun 2018 23:36:36 +0000 (16:36 -0700)]
Merge "Always cancel clock animation" into pi-dev
am:
a1cb973366
Change-Id: Ic90bb71af6578e3519f8bc72fa45693b76a0860b
TreeHugger Robot [Wed, 6 Jun 2018 23:35:13 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f am:
648a950ce9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Chavi Weingarten [Wed, 6 Jun 2018 23:31:49 +0000 (16:31 -0700)]
Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev
am:
cf5514257f
Change-Id: I96d4882d471f7ffd81625ea649ac4cd7442cf2b7
Emilian Peev [Wed, 6 Jun 2018 23:27:37 +0000 (16:27 -0700)]
Merge "media: Check window connect status in ImageWriter" into pi-dev
am:
596fea9581
Change-Id: I6bcd4b23b0db6c8efeb40d22bda97f675da09a2b
Winson Chung [Wed, 6 Jun 2018 23:22:40 +0000 (16:22 -0700)]
Merge "Fix PiP regression when the stack animation is canceled" into pi-dev
am:
19cfc1a754
Change-Id: Ic0aba5ae584185b75ca7c7c0fd8e0426b401f022
Rohan Shah [Wed, 6 Jun 2018 23:18:32 +0000 (16:18 -0700)]
Merge "[QS] Change Date font in QQS" into pi-dev
am:
c754707b76
Change-Id: Ib16afb12e3435fcc0f6db6d3154a789cba0a374e
TreeHugger Robot [Wed, 6 Jun 2018 23:06:28 +0000 (23:06 +0000)]
Merge "Minor autofill logging improvements." into pi-dev
Nan Zhang [Wed, 6 Jun 2018 23:01:51 +0000 (23:01 +0000)]
Merge "Add metalava-api-stubs targets" into pi-dev
Anthony Hugh [Tue, 5 Jun 2018 23:00:34 +0000 (16:00 -0700)]
Fix toast for wearables
Update margins, colors, etc. to ensure toast on wearables looks correct.
BUG:
71634382
Change-Id: I8180e5080e0a6860b40dbb2faa791f0ede926ca7
Ryan Mitchell [Wed, 6 Jun 2018 22:50:57 +0000 (15:50 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
am:
2b6805fedc
Change-Id: I5ef0a789b16dc8aa0936d8fcca3917ce2f884d74
Mihai Popa [Wed, 6 Jun 2018 22:46:03 +0000 (15:46 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours am:
ac169beb52 -s ours
am:
4ae55000b2 -s ours
Change-Id: I16b4f8d33496eb6f7770a56c1907aab0a69da0ae
Tracy Zhou [Wed, 6 Jun 2018 22:40:42 +0000 (15:40 -0700)]
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev
am:
dd12d33981
Change-Id: If382a57e958308d097d3eb55326f3c3eec3785e2
Sunny Goyal [Wed, 6 Jun 2018 22:16:52 +0000 (15:16 -0700)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
am:
09dc071562
Change-Id: I026ba2135544c06573161edae0ccbca2f22fe379
TreeHugger Robot [Wed, 6 Jun 2018 22:16:36 +0000 (22:16 +0000)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
Bill Yi [Wed, 6 Jun 2018 22:10:32 +0000 (15:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6824fdb401 -s ours
Change-Id: Ide2923656fb10c930f937637d0498e33b1f762a7
Selim Cinek [Wed, 6 Jun 2018 22:10:07 +0000 (15:10 -0700)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
am:
a2537b7269
Change-Id: I40d6d770656bffda13aa1712a8680723c680d457
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233 am:
c51c6751d7
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
Bill Yi [Wed, 6 Jun 2018 22:06:06 +0000 (15:06 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
891fa6f6af -s ours
Change-Id: I86f2b66c90f63ccde66d604122d8cae142cc0b09
Bill Yi [Wed, 6 Jun 2018 22:05:13 +0000 (15:05 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
d3e66495cd -s ours
Change-Id: Ibecf961ddfedf73aaa1ae3d351efaaad1f148253
Bill Yi [Wed, 6 Jun 2018 22:04:45 +0000 (15:04 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
158e38c3ed -s ours
Change-Id: I4149472c8d9fce00259d1c6a4e5f8ca77c512169
Nicolas Geoffray [Wed, 6 Jun 2018 22:04:10 +0000 (15:04 -0700)]
Merge "Light grey bugbot updates." into pi-dev
am:
bfa0ee12cf
Change-Id: Ie3e476301539c90504afe49751eec2340073fcb1
Mihai Popa [Wed, 6 Jun 2018 22:00:07 +0000 (15:00 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours am:
7478894a89 -s ours
am:
999d9e1bf0 -s ours
Change-Id: I528540470320fbd8d67a8ea15293c592e5864cf6
Rebecca Silberstein [Wed, 6 Jun 2018 21:42:45 +0000 (14:42 -0700)]
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev
am:
85bdd711ce
Change-Id: I5678f8bacda3a4bdff4c966ff60b86d922c3bd31
Julia Reynolds [Wed, 6 Jun 2018 21:38:46 +0000 (14:38 -0700)]
Merge "Use correct attribute name." into pi-dev
am:
65a411ac45
Change-Id: Ibb2463b9d303347c34d8e1aeeb9275912136db2d
Jean-Michel Trivi [Wed, 6 Jun 2018 21:34:40 +0000 (14:34 -0700)]
Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev
am:
2e73ff5e6f
Change-Id: I55f799ed8b441eaf9baa2587d0a2fddf72b3a150
Winson Chung [Wed, 6 Jun 2018 21:28:48 +0000 (14:28 -0700)]
Merge "Expose the source component which launched this task." into pi-dev
am:
b4e4fc3a1e
Change-Id: Ib368be0c77d9f62bd2892f8d909d184cf346b2cf
Calin Juravle [Wed, 6 Jun 2018 21:24:46 +0000 (14:24 -0700)]
Merge "Remove sun.nio.fs.UnixChannelFactory from preloaded-classes" into pi-dev
am:
d8269005fe
Change-Id: I717850f6e1f9bf48661403b31f9e709fcbb668e2
TreeHugger Robot [Wed, 6 Jun 2018 21:21:37 +0000 (21:21 +0000)]
Merge "Status bar etc dots 4dp" into pi-dev
Evan Laird [Wed, 6 Jun 2018 21:20:39 +0000 (14:20 -0700)]
Merge "Consider icon scale when calculating icon offset in shelf" into pi-dev
am:
00c132cd35
Change-Id: Ib09a1f9586e9b72c5c4d80c098476bc19807998e
Evan Laird [Wed, 6 Jun 2018 21:16:36 +0000 (14:16 -0700)]
Merge "Wi-Fi, now corporeal!" into pi-dev
am:
bc6f64d557
Change-Id: I73de6c26f631c205cd14d3463e8c2158fb56fdd7
OSDN Git Service
