OSDN Git Service
Philip Quinn [Tue, 11 Jul 2017 16:53:04 +0000 (16:53 +0000)]
Merge "Hide the Keyguard bottom area overlay when dozing." into oc-dr1-dev
am:
2b6d358d55
Change-Id: Id8de1f9a19f39a5869b7eb6efda16dfe7c163815
Philip Quinn [Tue, 11 Jul 2017 16:44:49 +0000 (16:44 +0000)]
Merge "Hide the Keyguard bottom area overlay when dozing." into oc-dr1-dev
Jason Monk [Tue, 11 Jul 2017 16:34:04 +0000 (16:34 +0000)]
Merge "Fix zen panel theming" into oc-dr1-dev
am:
1cd7e7a431
Change-Id: I40430a3de3c8866a83a6e160f6a4d2adbd7481d4
Jason Monk [Tue, 11 Jul 2017 16:32:27 +0000 (16:32 +0000)]
Merge "Try to work on test flakyness." into oc-dr1-dev
am:
0c3d08d61c
Change-Id: I004c7f9ebb19a1628445d0a44dcf10754b2d2943
TreeHugger Robot [Tue, 11 Jul 2017 16:28:44 +0000 (16:28 +0000)]
Merge "Fix zen panel theming" into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 16:24:50 +0000 (16:24 +0000)]
Merge "Try to work on test flakyness." into oc-dr1-dev
Christine Franks [Tue, 11 Jul 2017 14:47:35 +0000 (14:47 +0000)]
Merge "Support demo mode and demo users" into oc-dr1-dev
am:
2f87ca1637
Change-Id: I429ce9d2c273c9b093e2f9fe789d126a0b95f198
Christine Franks [Tue, 11 Jul 2017 14:37:06 +0000 (14:37 +0000)]
Merge "Support demo mode and demo users" into oc-dr1-dev
Jason Monk [Tue, 11 Jul 2017 14:13:31 +0000 (10:13 -0400)]
Fix zen panel theming
The theme of the panel might be different than sysui now, so it
needs to use the right context.
Test: visual
Change-Id: Ic647421113f6721e63e69afc2b9c5d6c5b0e86f2
Fixes:
63530105
Jason Monk [Tue, 11 Jul 2017 14:05:03 +0000 (10:05 -0400)]
Try to work on test flakyness.
- Add bt permission
- mock more BT stuff
- Disable test that is causing crash on main thread
Test: runtest systemui
Change-Id: I5cddb71941cce4f9b595c65ef69919186addb6df
Fixes:
63568935
Lucas Dupin [Tue, 11 Jul 2017 13:33:55 +0000 (13:33 +0000)]
Merge "Lock pattern should be red when error" into oc-dr1-dev
am:
b02cbdeeb3
Change-Id: Iaf3f580af7b8e3bc7a4bfb7a9d5344bb37ab4dc6
TreeHugger Robot [Tue, 11 Jul 2017 13:25:01 +0000 (13:25 +0000)]
Merge "Lock pattern should be red when error" into oc-dr1-dev
Hugo Benichi [Tue, 11 Jul 2017 13:17:55 +0000 (13:17 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am:
d23be95dd7 -s ours
am:
eed04347e7
Change-Id: I742f7418f887e2622e6e4286b47c855ef50a09bb
Hugo Benichi [Tue, 11 Jul 2017 13:10:48 +0000 (13:10 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am:
d23be95dd7 -s ours
Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9
Hugo Benichi [Tue, 11 Jul 2017 11:56:52 +0000 (11:56 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
Bin Chen [Tue, 11 Jul 2017 11:23:55 +0000 (11:23 +0000)]
Merge "Fix typo in Parcel javadoc." am:
ed0e6009df am:
d29e275b5b
am:
4d4b9a2ac6
Change-Id: Ief5a7469fbf2161d116dc210f3aa007bb4d69455
Bin Chen [Tue, 11 Jul 2017 11:17:15 +0000 (11:17 +0000)]
Merge "Fix typo in Parcel javadoc." am:
ed0e6009df
am:
d29e275b5b
Change-Id: Id1fa7cc2948153697c8c34a2e4db632153218162
Bin Chen [Tue, 11 Jul 2017 11:10:23 +0000 (11:10 +0000)]
Merge "Fix typo in Parcel javadoc."
am:
ed0e6009df
Change-Id: I06d3ac4d00cfec5179ca6e636365617c644f9fcd
Treehugger Robot [Tue, 11 Jul 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Fix typo in Parcel javadoc."
Hugo Benichi [Tue, 11 Jul 2017 10:30:50 +0000 (10:30 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master am:
858ed182d6 -s ours
am:
2380d0e286 -s ours
Change-Id: Ibd569d8ad58a5631a1c1fcceca0e342c960f1660
Neil Fuller [Tue, 11 Jul 2017 10:26:05 +0000 (10:26 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master am:
cb996b5574
am:
9e86604cbd
Change-Id: I8118b8b1041ade5e19fee06289d1ba4c1848837f
Hugo Benichi [Tue, 11 Jul 2017 10:24:22 +0000 (10:24 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master
am:
858ed182d6 -s ours
Change-Id: Ia9a74f588f8600bf2e453d7e7f1b5e1a818c432d
Hugo Benichi [Tue, 11 Jul 2017 10:24:15 +0000 (10:24 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master am:
6ab950dd5f
am:
6659fdba55 -s ours
Change-Id: I30a343b25381f201cad4bff45df4ab6a1cf38e34
Neil Fuller [Tue, 11 Jul 2017 10:16:54 +0000 (10:16 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master
am:
cb996b5574
Change-Id: I42513c054183772a27fb985cee66440a88003143
Hugo Benichi [Tue, 11 Jul 2017 10:15:19 +0000 (10:15 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
am:
6ab950dd5f
Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268
Hugo Benichi [Tue, 11 Jul 2017 10:11:39 +0000 (10:11 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master
Android Build Merger (Role) [Tue, 11 Jul 2017 10:08:59 +0000 (10:08 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master
Neil Fuller [Tue, 11 Jul 2017 10:07:37 +0000 (10:07 +0000)]
Merge "Move column definitions to an inner class"
am:
ab0bb48965
Change-Id: Ie9fa51f05dc7df781e9e9bdeb9d3c21ca4cde6c8
Hugo Benichi [Tue, 11 Jul 2017 10:06:03 +0000 (10:06 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
Neil Fuller [Tue, 11 Jul 2017 10:01:01 +0000 (10:01 +0000)]
Merge "Move column definitions to an inner class"
Hugo Benichi [Tue, 11 Jul 2017 07:32:04 +0000 (07:32 +0000)]
Merge "Fix for the missing focus in WebView form fields." am:
2708da7bf6 -s ours am:
76ea0eb773
am:
2633524cd5
Change-Id: I2ad45500377e1e1a8b4ce550a058eec7facbde7f
Hugo Benichi [Tue, 11 Jul 2017 07:25:43 +0000 (07:25 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master am:
369bbf5d05
am:
06f8914e3d -s ours
Change-Id: Ica33b5ad53a52af9d95d2bc8c606ee6fedd776a4
Hugo Benichi [Tue, 11 Jul 2017 07:25:32 +0000 (07:25 +0000)]
Merge "Fix for the missing focus in WebView form fields." am:
2708da7bf6 -s ours
am:
76ea0eb773
Change-Id: I4799a8a5a3cf3c68774f40a560a1198d9af61eb6
Hugo Benichi [Tue, 11 Jul 2017 07:20:46 +0000 (07:20 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master
am:
369bbf5d05
Change-Id: I02802f762a62fc29ff383523d2c52ebd536a9715
Hugo Benichi [Tue, 11 Jul 2017 07:16:21 +0000 (07:16 +0000)]
Merge "Fix for the missing focus in WebView form fields."
am:
2708da7bf6 -s ours
Change-Id: Ia27a1468e2e81444562d592a0c9d5e4f48cc776c
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
(cherry pick from commit
22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into stage-aosp-master)
Change-Id: Iff025d68b824eac2c30b9656fd2494338eb07eb3
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: manually tested with captive portal testing setup while watching
event logs: adb logcat -b events | grep captiveportallogin
06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]
Change-Id: I38b8e4dd3d62ad1261695780aeb2377f26a25997
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
Merged-In: I9184f6263a003c2be28f41a550c6164c8d6ee907
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Hugo Benichi [Tue, 11 Jul 2017 07:08:43 +0000 (07:08 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master
Hugo Benichi [Tue, 11 Jul 2017 07:05:26 +0000 (07:05 +0000)]
Merge "Fix for the missing focus in WebView form fields."
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: Iab22f8f0db0ab58cb0a184c3f88e6b3770a35fb0
Merged-In: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
(cherry pick from commit
97640400c4aa6bf05d5606ea749b54ad63de97cd)
Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.
Bug: b/
33073713
Test: builds
Change-Id: I50d9b8df1a0270e06c28f001adf6c52a142a85af
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
(cherry pick from commit
557e0c38b98f66d6147206f23d24d8d73b09e3e5)
Hugo Benichi [Wed, 31 May 2017 02:11:37 +0000 (11:11 +0900)]
New Metrics constants for captive portal related UI
This patch adds 5 new constants in metrics_constants for counting
various UI interactions involving captive portals:
- sign-in button in wifi network details card
- captive portal login activity start up
- captive portal login activity menu interactions (2 constants)
- captive portal login activity auto-closes on portal dismissed
Bug:
34901696
Bug:
26303355
Test: compiled, flashed
Change-Id: I01e2f2942b9d0183512cfddb248e66d3e33418d3
Merged-In: I489e5f2f8ff27da60fed215fa5f51326933fd79e
(cherry pick from commit
11da42bbb63dba98515e6a3ca7c55e77cbb3c7bf)
Android Build Merger (Role) [Tue, 11 Jul 2017 04:07:00 +0000 (04:07 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
88e9aa19e2 -s ours am:
91dcbe4bd9 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 11 Jul 2017 04:05:50 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
88e9aa19e2 -s ours
am:
91dcbe4bd9 -s ours
Change-Id: I9fb6e2699b3f737053741a2e26095241413dda76
Bill Yi [Tue, 11 Jul 2017 04:05:25 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
88e9aa19e2 -s ours
am:
8b44d3722d -s ours
Change-Id: I0dd1d3f0f62fa0a7c7379259f15f07e4f7e98a10
Bill Yi [Tue, 11 Jul 2017 04:04:10 +0000 (04:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9a18d59281 -s ours
Change-Id: If4df3f6424ae3719649f69669fb341e5bacc61e1
Android Build Merger (Role) [Tue, 11 Jul 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours am:
c928f9b87d -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 11 Jul 2017 04:00:23 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88e9aa19e2 -s ours
Change-Id: Id4a8d9d891b06a789132f9d9915306f336f52902
Bill Yi [Tue, 11 Jul 2017 03:59:40 +0000 (03:59 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours
am:
e2a38c087f -s ours
Change-Id: I1a354721fbdb5b6f2011e1852006eb9edb8bb7d2
Bill Yi [Tue, 11 Jul 2017 03:59:39 +0000 (03:59 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours
am:
c928f9b87d -s ours
Change-Id: Ie4abec8395e6de552cbfc70f228196defc49595f
Bill Yi [Tue, 11 Jul 2017 03:59:10 +0000 (03:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88e9aa19e2 -s ours
Change-Id: Iac87034d218ebdefbe1879192148ad323388c87c
TreeHugger Robot [Tue, 11 Jul 2017 03:57:08 +0000 (03:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 11 Jul 2017 03:52:59 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours
am:
829d7186d5 -s ours
Change-Id: I16754fc3b6c9df4b415d8c74ffe390787e932f8c
Bill Yi [Tue, 11 Jul 2017 03:52:20 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours
am:
829d7186d5 -s ours
Change-Id: Icf5cedc770c63dc8e5e41cb128d01135fe1596bf
TreeHugger Robot [Tue, 11 Jul 2017 03:50:19 +0000 (03:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Tue, 11 Jul 2017 03:43:57 +0000 (03:43 +0000)]
Import translations. DO NOT MERGE
am:
48cf1d9768 -s ours
Change-Id: If7328a10566daf60ac6da033923b1acbb307865f
Bin Chen [Tue, 11 Jul 2017 03:01:44 +0000 (11:01 +0800)]
Fix typo in Parcel javadoc.
Change-Id: Ida05259143e86c15c2ed69eeb7566d39b60fa823
Jeff Davidson [Tue, 11 Jul 2017 01:55:12 +0000 (01:55 +0000)]
Merge "Move eUICC permissions to com.android namespace." into oc-dr1-dev
am:
3fc57019bb
Change-Id: Ic29ac9c37bfd6c39fadd53ae57fb289a2f858d5e
TreeHugger Robot [Tue, 11 Jul 2017 01:48:08 +0000 (01:48 +0000)]
Merge "Move eUICC permissions to com.android namespace." into oc-dr1-dev
Paul McLean [Tue, 11 Jul 2017 00:51:18 +0000 (00:51 +0000)]
Merge "Catch exception in descriptor parser causes device connection to be skipped." into oc-dr1-dev
am:
22d4bf2283
Change-Id: I93f90134618fa282ccf7c8d0e2acedf37ee41446
Christine Franks [Sat, 24 Jun 2017 01:12:46 +0000 (18:12 -0700)]
Support demo mode and demo users
Bug:
62712426
Test: run cts -m CtsDevicePolicyManagerTestCases -t \
com.android.cts.devicepolicy.DeviceOwnerTest#testCreateAndManageEphemeralUser
and
run cts -m CtsDevicePolicyManagerTestCases -t \
com.android.cts.devicepolicy.DeviceOwnerTest# \
testCreateAndManageEphemeralUserFailsWithoutSplitSystemUser
and
runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest \
frameworks-services
Change-Id: I77a71a994fe0f4f1f8c5df7c4ccf493aafa8fefe
TreeHugger Robot [Tue, 11 Jul 2017 00:46:11 +0000 (00:46 +0000)]
Merge "Catch exception in descriptor parser causes device connection to be skipped." into oc-dr1-dev
Lucas Dupin [Mon, 10 Jul 2017 23:33:02 +0000 (16:33 -0700)]
Lock pattern should be red when error
Test: visual
Change-Id: I133ac629ca7ee6ae7e049711d024e6f776b10331
Fixes:
63450674
Bill Yi [Mon, 10 Jul 2017 21:56:13 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f7c93454c795da3db06572b1cddf9691ec4ff8e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Michal Karpinski [Mon, 10 Jul 2017 21:33:04 +0000 (21:33 +0000)]
Merge "Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice" into oc-dr1-dev
am:
150fec445a
Change-Id: I703b8b4cbcf810615946e7ef5bd4c6690ded8674
TreeHugger Robot [Mon, 10 Jul 2017 21:21:54 +0000 (21:21 +0000)]
Merge "Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice" into oc-dr1-dev
Bill Yi [Mon, 10 Jul 2017 21:17:29 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d78e510a92213c8cd7bf2ba96e756418b79aba8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 10 Jul 2017 21:08:01 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic838cd08ba00fe8aaf462f7de5908e63bcea79f5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Chen Xu [Mon, 10 Jul 2017 21:00:27 +0000 (21:00 +0000)]
Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
am:
037503dfa0
Change-Id: I008839786c3557f3dd418f8bb82f1cea0c27d3a1
Paul McLean [Mon, 10 Jul 2017 20:51:57 +0000 (14:51 -0600)]
Catch exception in descriptor parser causes device connection to be skipped.
Bug:
63538159
Test: Manual - force an exception and verify the the device is still available.
Change-Id: I4f4c59d4d0f73b664fac8bc74a64414d0e9d9a24
Chen Xu [Mon, 10 Jul 2017 20:51:52 +0000 (20:51 +0000)]
Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
Evan Laird [Mon, 10 Jul 2017 20:47:24 +0000 (20:47 +0000)]
Merge "Fix RTL mobile data type indicators" into oc-dr1-dev
am:
88da234e35
Change-Id: Idf63cdd6ce59a2e879c304392ebce93d5f01cb77
TreeHugger Robot [Mon, 10 Jul 2017 20:36:07 +0000 (20:36 +0000)]
Merge "Fix RTL mobile data type indicators" into oc-dr1-dev
Jason Monk [Mon, 10 Jul 2017 20:29:25 +0000 (20:29 +0000)]
Merge "Add screensaver settings to backup list" into oc-dr1-dev
am:
2c3c58d917
Change-Id: I981327b35f341600f908d479d4a4d36356b18b1d
TreeHugger Robot [Mon, 10 Jul 2017 20:17:56 +0000 (20:17 +0000)]
Merge "Add screensaver settings to backup list" into oc-dr1-dev
Neil Fuller [Mon, 10 Jul 2017 18:18:01 +0000 (19:18 +0100)]
Move column definitions to an inner class
Move column definitions and other URI constants
to inner classes based on feedback from an API council
reviewer.
Bug:
31008728
Test: make droid
Change-Id: I213e44f2655017e0ca32a4dfb1f5617ef471d854
fionaxu [Mon, 10 Jul 2017 16:34:07 +0000 (09:34 -0700)]
fix cellular captive portal reevaluation url
we apply redirection link as the url everywhere for cellular captive portal.
this url should only be used when load the portal page at the first place (when users
click on the notification) and shouldn't be used as the re-evaluation url
as it wont return the expected response code.
instead we should use special URL (generate_204) from connectivity
service which will return 204 if redirection is gone.
Test: manual test with cold and hot TMO SIM
Bug:
63351490
Bug:
62532802
Change-Id: I56bb03a58447c5c46758e692ff357d540ea4cd7b
Jason Monk [Mon, 10 Jul 2017 15:14:19 +0000 (11:14 -0400)]
Add screensaver settings to backup list
Test: manual
Change-Id: Icf47312e20b4ec44d02dc31ce575e89083a8be7d
Fixes:
35700553
Evan Laird [Mon, 10 Jul 2017 17:00:39 +0000 (13:00 -0400)]
Fix RTL mobile data type indicators
Data type indicators were drawing too big for their containers and
causing the data type overlays not to obey RTL. Also tweaked some sizes
to fix RTL.
Change-Id: I1aee7397976e77d2b834b163bf7fa7cf2a008968
Fixes:
62538496
Test: visual (RTL mode)
Winson Chung [Mon, 10 Jul 2017 17:18:45 +0000 (17:18 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev
am:
b544b81b53
Change-Id: Idf6f88cb33aa9ba39c67f83419b18c03ef829ed2
Winson Chung [Mon, 10 Jul 2017 17:12:35 +0000 (17:12 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev
Julia Reynolds [Mon, 10 Jul 2017 17:06:23 +0000 (17:06 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
am:
c65071d625
Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424
Lucas Dupin [Mon, 10 Jul 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
am:
8b94ef697e
Change-Id: Ic63c9dc9963846afd2ab854630d56512059609d9
Julia Reynolds [Mon, 10 Jul 2017 16:55:01 +0000 (16:55 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
Lucas Dupin [Mon, 10 Jul 2017 16:49:33 +0000 (16:49 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
Julia Reynolds [Mon, 10 Jul 2017 16:02:37 +0000 (16:02 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
am:
00d83ea50f
Change-Id: I9228a7b79f4c8f438fceb462128d16eddda2b563
TreeHugger Robot [Mon, 10 Jul 2017 15:57:32 +0000 (15:57 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
Neil Fuller [Mon, 10 Jul 2017 14:42:02 +0000 (14:42 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff am:
e293f7ee0d
am:
fa04abb74e
Change-Id: I8239ffae3bfd5b8414482c5e486f62af5b1bdf31
Neil Fuller [Mon, 10 Jul 2017 14:33:52 +0000 (14:33 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff
am:
e293f7ee0d
Change-Id: I5cf0cabc7c7abbce7a9c1181f40706966cafebfb
Bryce Lee [Mon, 10 Jul 2017 14:30:25 +0000 (14:30 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
am:
649053810f
Change-Id: Ifc8c8e2df9296072f1c5746cff0bc005755b60a8
Neil Fuller [Mon, 10 Jul 2017 14:26:32 +0000 (14:26 +0000)]
Merge "Configure the package name of the updater app"
am:
ed3e6d47ff
Change-Id: I6de319392c50bd8d6de56144d11333d18701fcdb
Bryce Lee [Mon, 10 Jul 2017 14:21:37 +0000 (14:21 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]
Merge "Configure the package name of the updater app"
Lorenzo Colitti [Mon, 10 Jul 2017 14:04:48 +0000 (14:04 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8 am:
97e7afe8d0
am:
856a887361
Change-Id: Ide3e67921fb2f1751c74e03d05d7eb7b83d26dca
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f am:
03e304e4e8
am:
0d53000386
Change-Id: I7e6064ba6d0b74584eec526d61ebb46abc02ad4f
Neil Fuller [Mon, 10 Jul 2017 13:55:46 +0000 (13:55 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd am:
d725e7aeab
am:
e17e10a123
Change-Id: I49e05c4578478b893bc378e2a7b2f10e90727e89
Lorenzo Colitti [Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8
am:
97e7afe8d0
Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e
Hugo Benichi [Mon, 10 Jul 2017 13:53:58 +0000 (13:53 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am:
d56856876f -s ours am:
ae62bb1d41
am:
6393105afb
Change-Id: I76dac07dd54ee15992d59a1e75eff5f3c2de6c25
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:52:37 +0000 (13:52 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f
am:
03e304e4e8
Change-Id: I3aadaccd191e59046db1ac138da71bbbc0261811
Neil Fuller [Mon, 10 Jul 2017 13:48:50 +0000 (13:48 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd
am:
d725e7aeab
Change-Id: Ic5fdbbcfed2d840a74b01443d9ba5806b52f4745
OSDN Git Service
