OSDN Git Service
Nicolas Geoffray [Fri, 25 May 2018 13:43:39 +0000 (06:43 -0700)]
Merge "More light grey apis." into pi-dev
am:
1b32d34457
Change-Id: I5f43a4d569c4965e3530f856d19e51099c616f75
Nicolas Geoffray [Fri, 25 May 2018 13:38:36 +0000 (06:38 -0700)]
Merge "Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey." into pi-dev
am:
83ee75a2de
Change-Id: I3fd7534da5fd815d8a9f3871ef8d0bbda85db7b4
Nicolas Geoffray [Fri, 25 May 2018 13:30:19 +0000 (13:30 +0000)]
Merge "More light grey apis." into pi-dev
Nicolas Geoffray [Fri, 25 May 2018 13:29:55 +0000 (13:29 +0000)]
Merge "Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey." into pi-dev
Jiyong Park [Fri, 25 May 2018 11:26:20 +0000 (04:26 -0700)]
[automerger skipped] Merge changes from topic "location_provider" am:
79b473ed7b
am:
77390bf307 -s ours
Change-Id: I5ef31499bd1e21237fa8a1752c035ae8341235b9
Jiyong Park [Fri, 25 May 2018 11:17:49 +0000 (04:17 -0700)]
Merge changes from topic "location_provider"
am:
79b473ed7b
Change-Id: I9a9985fd18db00d510ebae9e0dec69d6647a2332
Nicolas Geoffray [Fri, 25 May 2018 11:01:25 +0000 (04:01 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
32256ceb22
Change-Id: I1ffe50fb847f8986b41fabe9ee0c41fb72558ed9
TreeHugger Robot [Fri, 25 May 2018 10:49:18 +0000 (10:49 +0000)]
Merge "Add more light grey APIs." into pi-dev
Treehugger Robot [Fri, 25 May 2018 10:04:43 +0000 (10:04 +0000)]
Merge changes from topic "location_provider"
* changes:
Remove FlpHardwareProvider
Create the stubs lib for com.android.location.provider
Rubin Xu [Fri, 25 May 2018 09:56:21 +0000 (02:56 -0700)]
Merge "Add permission check to setAllowOnlyVpnForUids" am:
1fb2ed3de3
am:
1efa51a873
Change-Id: I43efafcb80a85f0cb94037440e66a2568b71af63
Nicolas Geoffray [Fri, 25 May 2018 09:46:32 +0000 (10:46 +0100)]
More light grey apis.
bug:
80270434
Test: m
Change-Id: I4877a782f9f8c0599de189d28df876d60d2c7b3d
Rubin Xu [Fri, 25 May 2018 09:46:33 +0000 (02:46 -0700)]
Merge "Add permission check to setAllowOnlyVpnForUids"
am:
1fb2ed3de3
Change-Id: I3a529eecf98a19c8ab421707fc952b2a56e10f34
Nicolas Geoffray [Fri, 25 May 2018 08:10:55 +0000 (09:10 +0100)]
Add more light grey APIs.
bug:
80256659
Test: m
Change-Id: Ic2a0ecffcd039cb5474625e39264714b9eed768a
Felipe Leme [Fri, 25 May 2018 09:09:38 +0000 (02:09 -0700)]
Merge "New Autofill field: FIELD_AUTOFILL_SESSION_ID" into pi-dev
am:
a278df4aae
Change-Id: I5aec308555c2effc4917d62124b057d6d2ed1744
TreeHugger Robot [Fri, 25 May 2018 08:57:23 +0000 (08:57 +0000)]
Merge "New Autofill field: FIELD_AUTOFILL_SESSION_ID" into pi-dev
Treehugger Robot [Fri, 25 May 2018 08:26:34 +0000 (08:26 +0000)]
Merge "Add permission check to setAllowOnlyVpnForUids"
Nicolas Geoffray [Fri, 25 May 2018 08:02:35 +0000 (01:02 -0700)]
Merge "Add some telephony API to light grey." into pi-dev
am:
7e1c36e64b
Change-Id: Ic68f3da20a5bb5dec2fb4c318d642714892415bb
Nicolas Geoffray [Fri, 25 May 2018 08:01:06 +0000 (09:01 +0100)]
Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey.
bug:
80091112
Test: m
Change-Id: Ia7c0cf66408fb241b029778d248dd3b7e324727a
Nicolas Geoffray [Fri, 25 May 2018 07:50:22 +0000 (07:50 +0000)]
Merge "Add some telephony API to light grey." into pi-dev
Jiyong Park [Thu, 8 Mar 2018 07:43:07 +0000 (16:43 +0900)]
Remove FlpHardwareProvider
After Treble's FLP merge into GNSS HAL, the FlpHardwareProvider is just
an empty shell. Removing FusedLocation and/or Flp + Hardware classes
altogether.
Bug:
35726697
Test: m -j
Test: Open Google Map and then walk around. The dot moves as I walk.
Merged-In: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
Change-Id: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
(cherry picked from commit
4cc3a1c056f69ac4da1dc5055c36b7357e9f673c)
Jiyong Park [Tue, 27 Feb 2018 13:00:23 +0000 (22:00 +0900)]
Create the stubs lib for com.android.location.provider
com.android.location.provider.stubs is the stubs library for the shared
library com.android.location.provider. The stubs library is intended to
provide the stable set of APIs to the apps implementing location
provider.
Without the stubs library, apps had to directly link to the shared
library which is built without Android SDK and exposes private APIs that
are not intended to be used by apps. This also has been causing the
lin-type check warnings when the shared lib is used by apps built with
SDK; apps built with SDK is not allowed to link to lib built without
SDK. This has been reported as warnings but will soon be errors. Now
such apps are required to link to the stubs lib, which is built with
SDK.
While building the stubs library, following APIs are made hidden because
they are exposing private APIs from the Android platform.
1) Activity* classes are removed from the API, as they are not intended
to be used by apps since O.
2) GeocodeProvider and GeofenceProvider are removed from the API.
3) LocationProvider.mLocationManager is removed as it is exposing the
private symbol ILocationProvider
4) ProviderPropertiesUnbundle.getProviderProperties are removed from the
API as it is exposing the private symbol ProviderProperties.
5) The constructor of ProviderRequestUnbundled is removed since the
class is intended to be instantiated by the service.
Bug:
71420593
Test: m -j com.android.location.provider.stubs
Merged-In: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
Change-Id: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
(cherry picked from commit
eee99986c8021d6825f99a25434725fccf7b2b12)
Felipe Leme [Thu, 24 May 2018 17:41:48 +0000 (10:41 -0700)]
New Autofill field: FIELD_AUTOFILL_SESSION_ID
This field contains the autofill session id (Thank You, Captain Obvious!), which
is useful to correlate autofill metrics that are not logged on
AUTOFILL_REQUEST.
Test: atest CtsAutoFillServiceTestCases # to make sure it didn't break anything
Test: manually run some test and watched
'adb shell logcat -b events | grep sysui'. Example:
[757,913,758,4,806,android.autofillservice.cts,871,android.autofillservice.cts.LoginActivity,914,2,915,2,1456,-
2045861404
Fixes:
80093094
Merged-In: If4b1c9ab616b2ba580745096894997eb7edb3e34
Change-Id: If4b1c9ab616b2ba580745096894997eb7edb3e34
Remi NGUYEN VAN [Fri, 25 May 2018 05:53:53 +0000 (22:53 -0700)]
[automerger skipped] Merge "Use AI_ADDRCONFIG for most DNS requests" am:
b19a838f47
am:
aa6ddd6685 -s ours
Change-Id: Ie19e3ef1c704f9318f067c03ccc75fdf6727fa89
Remi NGUYEN VAN [Fri, 25 May 2018 05:43:35 +0000 (22:43 -0700)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
am:
b19a838f47
Change-Id: I452da6fffe8eddedf0082c8ca7602566c82f6ebe
Remi NGUYEN VAN [Fri, 25 May 2018 05:25:33 +0000 (22:25 -0700)]
[automerger skipped] Merge "Migrating remaining core networking tests to Junit4" am:
96dbac0c5c
am:
a3c2022836 -s ours
Change-Id: I7df578d4f89b94e50d9f3798fc675b6a93477200
Aarthi Balachander [Fri, 25 May 2018 04:45:23 +0000 (21:45 -0700)]
Merge "Add missing copyright messages Test: Tested on Mojave Bug:
80266597 Change-Id: I1a2e712adabe8872f7c440e8e2c15787aea7aa98" into pi-dev
am:
9aafb212c5
Change-Id: I9f9133a555826c46482ca5dee27b595d4a720bf9
Remi NGUYEN VAN [Fri, 25 May 2018 04:37:04 +0000 (21:37 -0700)]
Merge "Migrating remaining core networking tests to Junit4"
am:
96dbac0c5c
Change-Id: I3d5c8274f76d00c61a384213ade1fae97c96ae24
TreeHugger Robot [Fri, 25 May 2018 04:24:29 +0000 (04:24 +0000)]
Merge "Add missing copyright messages Test: Tested on Mojave Bug:
80266597 Change-Id: I1a2e712adabe8872f7c440e8e2c15787aea7aa98" into pi-dev
Remi NGUYEN VAN [Fri, 25 May 2018 03:28:05 +0000 (03:28 +0000)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
Remi NGUYEN VAN [Fri, 25 May 2018 03:27:39 +0000 (03:27 +0000)]
Merge "Migrating remaining core networking tests to Junit4"
TreeHugger Robot [Fri, 25 May 2018 02:26:18 +0000 (02:26 +0000)]
Merge "screencap: return instead of _exit." into pi-dev-plus-aosp
Jason Monk [Fri, 25 May 2018 02:03:30 +0000 (19:03 -0700)]
Merge "Follow supportlib changes in SliceManager" into pi-dev
am:
96910a6dc2
Change-Id: I553c13a822d3944bd855575638680a29eedfba2e
Felipe Leme [Fri, 25 May 2018 01:56:49 +0000 (18:56 -0700)]
Merge "Added the class name of activity being autofilled on (most) autofill metrics." into pi-dev
am:
41a60f4033
Change-Id: Ie09496de119a9e1777218466a250ddbf3867a630
Felipe Leme [Fri, 25 May 2018 01:52:23 +0000 (18:52 -0700)]
Merge "Merged many autofill session metrics into AUTOFILL_REQUEST:" into pi-dev
am:
94594d1290
Change-Id: Ic233280a9f2272732d81021311b43979dcbbe691
Mike Digman [Fri, 25 May 2018 01:23:09 +0000 (18:23 -0700)]
Merge "Tweak new rotate icon and motion" into pi-dev
am:
a9050275ba
Change-Id: Ibda7cf39ebb2533f1b46a69ed45cf4907f47d11b
Jason Monk [Fri, 25 May 2018 01:21:35 +0000 (01:21 +0000)]
Merge "Follow supportlib changes in SliceManager" into pi-dev
Steven Moreland [Fri, 25 May 2018 00:48:28 +0000 (17:48 -0700)]
screencap: return instead of _exit.
_exit was being used instead of return in order to
work around a static destructor issue that has been
fixed.
Bug:
77934844
Test: screencap (and it doesn't crash)
Change-Id: I5dc25b0af5099993a94705ac9c7b439e68432824
TreeHugger Robot [Fri, 25 May 2018 00:55:42 +0000 (00:55 +0000)]
Merge "Added the class name of activity being autofilled on (most) autofill metrics." into pi-dev
Makoto Onuki [Fri, 25 May 2018 00:54:37 +0000 (17:54 -0700)]
Merge "Tweak exemption for sync requests made by FG apps" into pi-dev
am:
621fd20f55
Change-Id: I31ae3e9e11b9defb7e6352830439484d7ec7ac01
Aarthi Balachander [Fri, 25 May 2018 00:34:10 +0000 (17:34 -0700)]
Add missing copyright messages
Test: Tested on Mojave
Bug:
80266597
Change-Id: I1a2e712adabe8872f7c440e8e2c15787aea7aa98
TreeHugger Robot [Fri, 25 May 2018 00:18:41 +0000 (00:18 +0000)]
Merge "Merged many autofill session metrics into AUTOFILL_REQUEST:" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 00:13:35 +0000 (00:13 +0000)]
Merge "Tweak new rotate icon and motion" into pi-dev
Tracy Zhou [Fri, 25 May 2018 00:03:04 +0000 (17:03 -0700)]
Merge "Fix boundary condition of showing quickscrub tip after dismissal." into pi-dev
am:
0726f5c82a
Change-Id: I10f9bd7919f6d7cca4c3972145334b4aac939563
Makoto Onuki [Thu, 24 May 2018 23:22:09 +0000 (23:22 +0000)]
Merge "Tweak exemption for sync requests made by FG apps" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 23:18:19 +0000 (23:18 +0000)]
Merge "Fix boundary condition of showing quickscrub tip after dismissal." into pi-dev
Evan Laird [Thu, 24 May 2018 23:04:53 +0000 (16:04 -0700)]
Merge "Put a little space between wifi and data type" into pi-dev
am:
2640b2142e
Change-Id: I4667dca524a67d13fa11f930eda606ed74fc3e89
TreeHugger Robot [Thu, 24 May 2018 22:12:16 +0000 (22:12 +0000)]
Merge "Put a little space between wifi and data type" into pi-dev
Android Build Merger (Role) [Thu, 24 May 2018 21:48:59 +0000 (21:48 +0000)]
Merge "Merge "Update location icons (qs + status)" into pi-dev am:
478923bded" into pi-dev-plus-aosp
Evan Laird [Thu, 24 May 2018 21:48:35 +0000 (14:48 -0700)]
Merge "Update location icons (qs + status)" into pi-dev
am:
478923bded
Change-Id: I524eb54f32c297de6a5eca1d4ed7f2f753adce3d
Tracy Zhou [Thu, 24 May 2018 21:41:34 +0000 (14:41 -0700)]
Fix boundary condition of showing quickscrub tip after dismissal.
It's possible that user opens overview 11 times after first dismissal of
Quickscrub tip before going to an app and our current condition check would fail. Change
the condition of showing swipe-up tip for consistency.
Change-Id: If58f9b6f2edfbdccf68a2c44e0b3b4b489862734
Fixes:
80256933
Test: Manual test
Chih-Hung Hsieh [Thu, 24 May 2018 21:44:52 +0000 (14:44 -0700)]
Merge "Work around b/
24465209, do not pack relocation table." am:
d01890df3c
am:
d7f77b5a12
Change-Id: I4922e3c5c43d90b270a23c6fff343826941a4237
Evan Laird [Thu, 24 May 2018 21:34:05 +0000 (14:34 -0700)]
Merge "Add tuning to SystemUI to draw into a DisplayCutout's bounds" into pi-dev
am:
bb5154982e
Change-Id: Icac4be32d8469b860b21185417434b812c68b2c3
Chih-Hung Hsieh [Thu, 24 May 2018 21:33:24 +0000 (14:33 -0700)]
Merge "Work around b/
24465209, do not pack relocation table."
am:
d01890df3c
Change-Id: If94d1d0587ad7314df416407c1ab4ad8dedc559a
Michael Wachenschwanz [Thu, 24 May 2018 21:26:40 +0000 (14:26 -0700)]
Merge "Revert "Revert "Write UsageEvents Parcel data as a Blob""" into pi-dev
am:
14c61286c4
Change-Id: If4e6d7fbf0d6799ce88ec33b37fb8cef7e290f1e
Wale Ogunwale [Thu, 24 May 2018 21:22:04 +0000 (14:22 -0700)]
Merge "Added display null check to ActivityStackSupervisor.getNextFocusableStackLocked" into pi-dev
am:
473b8b09b0
Change-Id: I7fb50faab7f5eeb760eb698f95ccb03ea95bb38f
Antony Sargent [Thu, 24 May 2018 21:17:24 +0000 (14:17 -0700)]
Merge "Update some app permission icons" into pi-dev
am:
d49118bd48
Change-Id: I790943113a9db1c3fbdc49ba829b80d99241877a
Beverly [Thu, 24 May 2018 21:12:44 +0000 (14:12 -0700)]
Merge "Flip flag to enable vibration on wireless charging" into pi-dev
am:
65477d138d
Change-Id: Ieb817348628c020578ea7c8c7205b6e9f412e2ed
Beverly [Thu, 24 May 2018 21:07:58 +0000 (14:07 -0700)]
Merge "On configuration change setup screen decorations" into pi-dev
am:
10908b1972
Change-Id: I2857ad8c969543843821e64154df9d738c4368db
Mike Digman [Thu, 24 May 2018 18:06:05 +0000 (11:06 -0700)]
Tweak new rotate icon and motion
Slightly reduce the icon size to decrease its size relative to the new
back button. Use scaleX attribute to ensure arrows always point in
direction of motion. Fix intro animation bug where rippling would only
happen for first three loops.
Bug:
79930974
Test: manual
Change-Id: I6b8d4acd4c1537649d0120663169e7a1fd4db7fb
Lucas Dupin [Thu, 24 May 2018 21:03:24 +0000 (14:03 -0700)]
Merge "Revert "WallpaperColors hint computation"" into pi-dev
am:
cf2c35dca6
Change-Id: Ibc3760ce650c8d48f261e6486edb51582391b710
Felipe Leme [Tue, 22 May 2018 21:56:15 +0000 (14:56 -0700)]
Added the class name of activity being autofilled on (most) autofill metrics.
Test: atest CtsAutoFillServiceTestCases # to make sure it didn't break anything
Test: manually run some test and watched
'adb shell logcat -b events | grep sysui'
Fixes:
80151641
Change-Id: I5b83e6ceb549a641d10c39bbfd4f24d0a43d1a23
Android Build Merger (Role) [Thu, 24 May 2018 20:54:27 +0000 (20:54 +0000)]
Merge "Merge "Hide system apps until installed (1/2)" into pi-dev am:
56cc567dfd" into pi-dev-plus-aosp
TreeHugger Robot [Thu, 24 May 2018 20:50:41 +0000 (20:50 +0000)]
Merge "Update location icons (qs + status)" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 20:50:35 +0000 (20:50 +0000)]
Merge "Add tuning to SystemUI to draw into a DisplayCutout's bounds" into pi-dev
Andreas Gampe [Thu, 24 May 2018 20:49:41 +0000 (13:49 -0700)]
Merge "Framework: Add API to get zygote PID" am:
1109e2333f
am:
07578c786a
Change-Id: Ibee53631caad0d6ce2108970598f5226d20a849d
sanryhuang [Thu, 24 May 2018 20:49:35 +0000 (13:49 -0700)]
Merge "Hide system apps until installed (1/2)" into pi-dev
am:
56cc567dfd
Change-Id: I5256f98f1face09fbd95146d8a36335b37b3091f
Michael Wachenschwanz [Thu, 24 May 2018 20:45:34 +0000 (20:45 +0000)]
Merge "Revert "Revert "Write UsageEvents Parcel data as a Blob""" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 20:41:14 +0000 (20:41 +0000)]
Merge "Added display null check to ActivityStackSupervisor.getNextFocusableStackLocked" into pi-dev
Chalard Jean [Thu, 24 May 2018 20:35:45 +0000 (13:35 -0700)]
Merge "Destroy networks as soon as they are disconnected." into pi-dev
am:
d88abbfd78
Change-Id: I0617f0ff6e46a1d3764335a1e7ad01b34c8cc5a8
TreeHugger Robot [Thu, 24 May 2018 20:17:14 +0000 (20:17 +0000)]
Merge "Update some app permission icons" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 20:05:54 +0000 (20:05 +0000)]
Merge "Flip flag to enable vibration on wireless charging" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 20:05:49 +0000 (20:05 +0000)]
Merge "On configuration change setup screen decorations" into pi-dev
Eino-Ville Talvala [Thu, 24 May 2018 20:05:23 +0000 (13:05 -0700)]
Merge "DngCreator: Use new LENS_DISTORTION result field if available." into pi-dev
am:
05a6e77106
Change-Id: I7a581cd2966ce1a5370bbfb5dc581d2552e7bff1
Andreas Gampe [Thu, 24 May 2018 20:00:41 +0000 (13:00 -0700)]
Merge "Framework: Add API to get zygote PID"
am:
1109e2333f
Change-Id: I6f50efa61bcdec321cd71edae8a28881293c0398
TreeHugger Robot [Thu, 24 May 2018 20:00:27 +0000 (20:00 +0000)]
Merge "Revert "WallpaperColors hint computation"" into pi-dev
Michael Wright [Thu, 24 May 2018 19:58:15 +0000 (12:58 -0700)]
Merge "Use TCM context if application context is unavailble." into pi-dev
am:
87631c2d29
Change-Id: I8ec20d2c5815dfffeb60f11c0b8f9490feed5e94
Michael Wachenschwanz [Thu, 24 May 2018 19:53:33 +0000 (12:53 -0700)]
Merge "Revert "Write UsageEvents Parcel data as a Blob"" into pi-dev
am:
d55c618340
Change-Id: I88a269fd3bcb9f6cda5c6f95ac7edb84db1239f1
Nicolas Geoffray [Thu, 24 May 2018 19:48:57 +0000 (12:48 -0700)]
Merge "Add camera APIs to light grey." into pi-dev
am:
9ed0da42b3
Change-Id: I985d6d64b670b4f56ad684c94bc83b21b7bd4185
Mathew Inwood [Thu, 24 May 2018 19:44:22 +0000 (12:44 -0700)]
Merge "More greylist additions from bug scrape." into pi-dev
am:
7ac3797f16
Change-Id: I9146e0e5d0bc39438c836f9e2cddd881e08b2a16
Jaewan Kim [Thu, 24 May 2018 19:39:29 +0000 (12:39 -0700)]
Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev
am:
0e7a307e14
Change-Id: I455466d79d0c1b534d87b33cdb787194422a51bf
Hui Yu [Thu, 24 May 2018 19:34:51 +0000 (12:34 -0700)]
Merge "Calculate cellular radio value from modem.controller values." into pi-dev
am:
b82d3d7e74
Change-Id: Id309129d9a12a2ec97785c0ef69d09e4cce1dd27
Android Build Merger (Role) [Thu, 24 May 2018 19:19:30 +0000 (19:19 +0000)]
Merge "Merge "Initial changes for full-width quickscrub." into pi-dev am:
004e01d388" into pi-dev-plus-aosp
Winson Chung [Thu, 24 May 2018 19:18:58 +0000 (12:18 -0700)]
Merge "Initial changes for full-width quickscrub." into pi-dev
am:
004e01d388
Change-Id: I47d4709cd607cb12057c36f76074474ba0875f45
Daisuke Teranishi [Thu, 24 May 2018 19:18:14 +0000 (12:18 -0700)]
Merge "Use correct filename when adding to ringtone" am:
daff857ffd
am:
24062f05d3
Change-Id: Id9d89491c5604b1611b22f215827f55de98f8ac2
Android Build Merger (Role) [Thu, 24 May 2018 19:14:40 +0000 (19:14 +0000)]
Merge "Merge "Fork navbar layout for quickstep" into pi-dev am:
5d8559fea3" into pi-dev-plus-aosp
Mike Digman [Thu, 24 May 2018 19:14:13 +0000 (12:14 -0700)]
Merge "Fork navbar layout for quickstep" into pi-dev
am:
5d8559fea3
Change-Id: I90f524dba0edfdee7b83f71d7f6b69fc9c48855e
Treehugger Robot [Thu, 24 May 2018 19:13:19 +0000 (19:13 +0000)]
Merge "Work around b/
24465209, do not pack relocation table."
Android Build Merger (Role) [Thu, 24 May 2018 19:11:45 +0000 (19:11 +0000)]
Merge changes from topic "am-
dfb2548770de4bb299490c765377bd11" into pi-dev-plus-aosp
* changes:
Merge changes Id81271ff,I8f298371 am:
e7372ab0d5 am:
e770b16975
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt am:
85c81cb24c -s ours am:
6041de0722 -s ours
David Brazdil [Thu, 24 May 2018 19:11:13 +0000 (12:11 -0700)]
Merge changes Id81271ff,I8f298371 am:
e7372ab0d5
am:
e770b16975
Change-Id: I60749ef44cb4dc2c1629831daabb71ed76030c97
Android Build Merger (Role) [Thu, 24 May 2018 19:09:59 +0000 (19:09 +0000)]
Merge "Merge "Fix issue with slippery flag not being updated correctly" into pi-dev am:
6450335b56" into pi-dev-plus-aosp
Winson Chung [Thu, 24 May 2018 19:09:25 +0000 (12:09 -0700)]
Merge "Fix issue with slippery flag not being updated correctly" into pi-dev
am:
6450335b56
Change-Id: If81769bf6e7911be9e16a2a092cff43b345dedce
David Brazdil [Thu, 24 May 2018 19:06:00 +0000 (12:06 -0700)]
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt am:
85c81cb24c -s ours
am:
6041de0722 -s ours
Change-Id: I1fe6b92ca9db6ea66427760fb529b39aaf30b304
Android Build Merger (Role) [Thu, 24 May 2018 19:05:13 +0000 (19:05 +0000)]
Merge "Merge "[Notif] Remove transient views on swipe out" into pi-dev am:
3622bfdba0" into pi-dev-plus-aosp
Rohan Shah [Thu, 24 May 2018 19:04:40 +0000 (12:04 -0700)]
Merge "[Notif] Remove transient views on swipe out" into pi-dev
am:
3622bfdba0
Change-Id: I6038513050265cdd508188bc71f42b1a42eaf8e5
Remi NGUYEN VAN [Thu, 24 May 2018 19:03:38 +0000 (12:03 -0700)]
[automerger skipped] Merge changes I3b3bcbbd,I18b3f263,I3c416c1a am:
7b0935509d
am:
20c62063b6 -s ours
Change-Id: Ib1c7270ff0b4dff4f693d9d9a7330bd70ec7505d
Android Build Merger (Role) [Thu, 24 May 2018 19:00:30 +0000 (19:00 +0000)]
Merge "Merge "Unsuspending packages when a PO or DO is set" into pi-dev am:
24e913e5a8" into pi-dev-plus-aosp
Suprabh Shukla [Thu, 24 May 2018 19:00:03 +0000 (12:00 -0700)]
Merge "Unsuspending packages when a PO or DO is set" into pi-dev
am:
24e913e5a8
Change-Id: Ibc0d2d064fa642f668cf084022f0f7d10e82bc88
Android Build Merger (Role) [Thu, 24 May 2018 18:55:51 +0000 (18:55 +0000)]
Merge "Merge "Camera: Use fallback key if the requested key returns null" into pi-dev am:
062c050d01" into pi-dev-plus-aosp
Justin Yun [Thu, 24 May 2018 18:54:36 +0000 (11:54 -0700)]
Merge "Camera: Use fallback key if the requested key returns null" into pi-dev
am:
062c050d01
Change-Id: If26bfe174dcc91e52ffae386041a9215c87316f8
Android Build Merger (Role) [Thu, 24 May 2018 18:50:26 +0000 (18:50 +0000)]
Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am:
1a9def3dc7" into pi-dev-plus-aosp