OSDN Git Service
Lucas Dupin [Tue, 18 Jul 2017 18:36:12 +0000 (18:36 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
am:
df83b8cfcf
Change-Id: Id2b3ebf54192171f81028da83469a9efdc2840ea
TreeHugger Robot [Tue, 18 Jul 2017 18:23:55 +0000 (18:23 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
Bryce Lee [Tue, 18 Jul 2017 17:06:09 +0000 (17:06 +0000)]
Merge "Ensure home activity always is on home stack." into oc-dr1-dev
am:
560acb043d
Change-Id: I41ec14fb2ff092643c2ce54e263da91769541b49
Bryce Lee [Tue, 18 Jul 2017 16:59:10 +0000 (16:59 +0000)]
Merge "Ensure home activity always is on home stack." into oc-dr1-dev
Fredrik Roubert [Tue, 18 Jul 2017 11:14:55 +0000 (11:14 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t. am:
253e515259
am:
042534c352
Change-Id: I34b8a04b7589dc8cc5850aba5c3d50aa2c1b4e02
Fredrik Roubert [Tue, 18 Jul 2017 11:08:47 +0000 (11:08 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
am:
253e515259
Change-Id: I064ae78ad17bef67d6e90c7ce0aed4e9693c9ac6
Geoffrey Pitsch [Tue, 18 Jul 2017 10:29:23 +0000 (10:29 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
am:
331a287656
Change-Id: Ie00665beb58cfb797cfdc85c20adfb28988055b2
TreeHugger Robot [Tue, 18 Jul 2017 10:24:17 +0000 (10:24 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Lucas Dupin [Tue, 18 Jul 2017 00:25:20 +0000 (17:25 -0700)]
Renamed attribute with abbreviated name
Renamed attribute as part of refactoring overlays.
Bug:
63751714
Test: make
Change-Id: Ia75fbf6c1dbcbd530d6b03a239b61b61719da8e0
Makoto Onuki [Tue, 18 Jul 2017 00:14:22 +0000 (00:14 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev
am:
479b762f99
Change-Id: Id9d3f896a534714eaf16762f80bc6c3a1c65b532
TreeHugger Robot [Tue, 18 Jul 2017 00:07:16 +0000 (00:07 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev
Winson Chung [Mon, 17 Jul 2017 23:40:18 +0000 (23:40 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev
am:
8aaa5adae6
Change-Id: I242d4796e7b74e720daebbf274c849eb37100c03
TreeHugger Robot [Mon, 17 Jul 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev
Tim Murray [Mon, 17 Jul 2017 23:23:37 +0000 (23:23 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev
am:
d12ecb1ed5
Change-Id: I1c83b7fd89f15e08188512156db42bed5c073b41
Tim Murray [Mon, 17 Jul 2017 23:16:41 +0000 (23:16 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev
Mark Salyzyn [Mon, 17 Jul 2017 22:58:35 +0000 (22:58 +0000)]
Merge "BootReceiver: check console-ramoops-0" am:
a09784ac75 am:
e7715b35ea
am:
be25a82472
Change-Id: I389d8faf7d30b48bfafac17251216346eb9cb713
Neil Fuller [Mon, 17 Jul 2017 22:53:29 +0000 (22:53 +0000)]
Merge "Address post-commit review comments" am:
858634e4ec am:
5c15f6d6b1
am:
1a35cf3892
Change-Id: I4f3bbd22c853b7fcb6f52e7e0543fc63712bfdbd
Android Build Merger (Role) [Mon, 17 Jul 2017 22:49:53 +0000 (22:49 +0000)]
Merge "Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp am:
c8eaf5a3a4" into oc-dr1-dev-plus-aosp
Neil Fuller [Mon, 17 Jul 2017 22:48:15 +0000 (22:48 +0000)]
Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp
am:
c8eaf5a3a4
Change-Id: I49dcec61ce9b64cf105b7432d9c73cf5e3edd8e7
Android Build Merger (Role) [Mon, 17 Jul 2017 22:47:39 +0000 (22:47 +0000)]
Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c am:
84a4d3de65" into oc-dr1-dev-plus-aosp
Mark Salyzyn [Mon, 17 Jul 2017 22:46:45 +0000 (22:46 +0000)]
Merge "BootReceiver: check console-ramoops-0" am:
a09784ac75
am:
e7715b35ea
Change-Id: I4ea86cc33247c2b7bf187cc8b2bc5b9c7aadc1f4
Benjamin Miller [Mon, 17 Jul 2017 22:46:08 +0000 (22:46 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c
am:
84a4d3de65
Change-Id: I0c2013d5243abaaa892c638fe23b9a55896b4cdc
Benjamin Miller [Mon, 17 Jul 2017 22:45:39 +0000 (22:45 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c
am:
8322920a7c
Change-Id: I1605d6607d5057566164f03c6f9c87bfa7fa8546
Neil Fuller [Mon, 17 Jul 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Address post-commit review comments" am:
858634e4ec
am:
5c15f6d6b1
Change-Id: I967e815611149c2fd9b6ca39e9fcf9eab3b23771
Android Build Merger (Role) [Mon, 17 Jul 2017 22:41:41 +0000 (22:41 +0000)]
Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp
Neil Fuller [Mon, 17 Jul 2017 22:40:28 +0000 (22:40 +0000)]
Merge "Remove TODOs that are not needed" am:
0f9842304a am:
5c2cfc51c5
am:
444616f4bf
Change-Id: I5f4265d738aa3669a0c7acb8df49b454a3e27f9c
Neil Fuller [Mon, 17 Jul 2017 22:40:01 +0000 (22:40 +0000)]
Merge "Remove unnecessary TODOs" am:
a5c96cf4bf
am:
08cff4c76b
Change-Id: I2682cc46391b6120ac846c011bee0eab30c55e86
Benjamin Miller [Mon, 17 Jul 2017 22:39:28 +0000 (22:39 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am:
d726ff988c
Change-Id: I031f226a4324521a8940453c96da870a49767233
Benjamin Miller [Mon, 17 Jul 2017 22:37:35 +0000 (22:37 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am:
d726ff988c
Change-Id: I42a62feffca60e8beb75e991ea0b6545a2813233
Mark Salyzyn [Mon, 17 Jul 2017 22:34:23 +0000 (22:34 +0000)]
Merge "BootReceiver: check console-ramoops-0"
am:
a09784ac75
Change-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de
Neil Fuller [Mon, 17 Jul 2017 22:32:38 +0000 (22:32 +0000)]
Merge "Remove TODOs that are not needed" am:
0f9842304a
am:
5c2cfc51c5
Change-Id: Ia585380cb88829bf55171092389b77081d941f17
Neil Fuller [Mon, 17 Jul 2017 22:32:37 +0000 (22:32 +0000)]
Merge "Address post-commit review comments"
am:
858634e4ec
Change-Id: Ia530cc2cdf583baae825386a52fdb8eb3763d99b
TreeHugger Robot [Mon, 17 Jul 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
Neil Fuller [Mon, 17 Jul 2017 22:26:48 +0000 (22:26 +0000)]
Merge "Remove unnecessary TODOs"
am:
a5c96cf4bf
Change-Id: I1e03cd3fa9eef34218e4a4eb958fbb6dd0593be6
Treehugger Robot [Mon, 17 Jul 2017 22:24:39 +0000 (22:24 +0000)]
Merge "BootReceiver: check console-ramoops-0"
Neil Fuller [Mon, 17 Jul 2017 22:24:36 +0000 (22:24 +0000)]
Merge "Remove TODOs that are not needed"
am:
0f9842304a
Change-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79
Neil Fuller [Mon, 17 Jul 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Address post-commit review comments"
Neil Fuller [Mon, 17 Jul 2017 22:15:42 +0000 (22:15 +0000)]
Merge "Remove unnecessary TODOs"
Neil Fuller [Mon, 17 Jul 2017 22:15:08 +0000 (22:15 +0000)]
Merge "Remove TODOs that are not needed"
xutianguo [Mon, 17 Jul 2017 22:10:38 +0000 (22:10 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am:
66af025fea am:
75bd16d2df
am:
cf6e784219
Change-Id: Id547d1512a28fd4f1ebb8c76fa4f23324d576de3
xutianguo [Mon, 17 Jul 2017 22:04:56 +0000 (22:04 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am:
66af025fea
am:
75bd16d2df
Change-Id: I92e4e1268f6a7832cbc99396749eb7b89b19a57a
xutianguo [Mon, 17 Jul 2017 21:58:04 +0000 (21:58 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
am:
66af025fea
Change-Id: Iab47add488fd9f4e09f2d0a2aacb435b0cdb24d0
Treehugger Robot [Mon, 17 Jul 2017 21:47:31 +0000 (21:47 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
Bryce Lee [Mon, 17 Jul 2017 17:39:24 +0000 (10:39 -0700)]
Ensure home activity always is on home stack.
It is possible to start a home activity on a non-home stack. For
example, an activity that handles the home intent may be started with
via a different intent, landing it on the fullscreen stack. This
becomes problematic later on due to our assumptions about the home
stack state and handling of tasks within it.
To ensure proper behavior, this changelist moves the activity
handling the home intent to the home stack if it is not already
present there.
Fixes:
36606833
Test: Move home activity to fullscreen stack, launch another
activity, press home button.
Test: go/wm-smoke
Change-Id: If88550a24dca3eabc0c60940937e6a1e6f133cae
Mark Salyzyn [Fri, 14 Jul 2017 20:08:47 +0000 (13:08 -0700)]
BootReceiver: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0
Test: none
Bug:
63058217
Change-Id: Ia68c0b5741c35cb35f10be6bbce93e0f0c92480f
Tim Murray [Fri, 14 Jul 2017 20:54:37 +0000 (13:54 -0700)]
power: throttle interaction hints
Don't send power HAL interaction hints more than every 100ms. Also can send userActivity
calls every 100ms too (down from 500ms).
Test: power HAL doesn't run every 8ms
bug
63632697
Change-Id: Ic986f6fc51e58f8060f7bf2d2ac61a9906be5c1f
Tom Cherry [Mon, 17 Jul 2017 19:31:37 +0000 (19:31 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master am:
d600905e4a
am:
94f7e0f7b9 -s ours
Change-Id: If546c3cd46fbceddd8e48553a88cda7b3abde3e9
Tom Cherry [Mon, 17 Jul 2017 19:26:01 +0000 (19:26 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
am:
d600905e4a
Change-Id: I6366391c3bb0c8df8d15427d32369f180c3f2060
Tom Cherry [Mon, 17 Jul 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
xutianguo [Mon, 22 May 2017 06:03:33 +0000 (14:03 +0800)]
Make BluetoothStateChangeCallback oneway to prevent waiting on response.
Test: Connected bluetooth devices(included Headset/HID devices), and
made bluetooth enabling/disabling over 1000 times, no other side effect
observed.
Bug:
38485770
Change-Id: Ia3959d2441aece39a79ab2d662b57790a78df674
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
(cherry picked from commit
95e1e21a639318bb3399c394707624393cfa2300)
Winson Chung [Mon, 17 Jul 2017 18:35:39 +0000 (11:35 -0700)]
Fix issue with configuration update check.
- We can hold a reference to the same configuration since it is updated
and re-dispatched. Instead, make a copy of the configuration to store
the last configuration state.
Fixes:
63755686
Test: Open Recents, rotate, ensure that the display bounds and task bounds
are calculated correctly.
Change-Id: Ie0d2b5a0fa479428614d9593a2379420ccbd2fb4
Benjamin Miller [Mon, 17 Jul 2017 11:01:35 +0000 (13:01 +0200)]
Docs-change: clarification of LauncherApps.getApplicationInfo()
Staged at: go/dac-stage/reference/android/content/pm/LauncherApps.html#getApplicationInfo(java.lang.String, int, android.os.UserHandle)
Test: make ds-docs and output staged
Bug:
38024981
Change-Id: I9f256d675433457b7c85fa111ed87d1147f1f2bc
nharold [Mon, 17 Jul 2017 18:11:47 +0000 (18:11 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner" am:
d1ffb13437 am:
e38e57c25d
am:
43d17a6785
Change-Id: I97f1cda1efc1fb7d699b34ab725a205d3143bdad
nharold [Mon, 17 Jul 2017 18:05:19 +0000 (18:05 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner" am:
d1ffb13437
am:
e38e57c25d
Change-Id: I59a8143162800f35748b1e145973743855faca09
Fredrik Roubert [Mon, 17 Jul 2017 18:04:35 +0000 (18:04 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am:
0f3d90eec8 -s ours am:
cd53e91851
am:
28f67840c6
Change-Id: Ifd1e474ff8b34e13dc66874008ea4b4346816c67
Fredrik Roubert [Mon, 17 Jul 2017 17:58:05 +0000 (17:58 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am:
0f3d90eec8 -s ours
am:
cd53e91851
Change-Id: I9c1955309c1669c49b0f7060c22de4767360a7c4
nharold [Mon, 17 Jul 2017 17:52:25 +0000 (17:52 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
am:
d1ffb13437
Change-Id: I2e8cde8a7be8bdbdeebb00df053fdc621d30cdec
Fredrik Roubert [Mon, 17 Jul 2017 17:50:02 +0000 (17:50 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
am:
0f3d90eec8 -s ours
Change-Id: If37c0a67a40a2b1ee0d5e3050cba38af5e932e83
Geoffrey Pitsch [Mon, 17 Jul 2017 17:37:45 +0000 (17:37 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
am:
f99ac67bdb
Change-Id: Icf54f81733d19d91913989451a5fc07ff5f1566d
Geoffrey Pitsch [Mon, 17 Jul 2017 17:31:26 +0000 (17:31 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
Neil Fuller [Mon, 17 Jul 2017 17:02:29 +0000 (18:02 +0100)]
Remove unnecessary TODOs
The classes under test are not part of a public
API so they are not tested via CTS.
Bug:
31008728
Test: make droid
Change-Id: If10db42b6e79728a6625708d35a04c5002164866
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Remove TODOs that are not needed
Remove TODOs to add classes to the system API that are not needed
(since they are used by a platform-only app).
Bug:
31008728
Test: make droid
Change-Id: I0d75686ddeae929e9d87c5ca8703a609a1450d76
Merged-In: I600e7b08853b86b27463193411cf85207ae09ce8
nharold [Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
Treehugger Robot [Mon, 17 Jul 2017 16:46:09 +0000 (16:46 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
Esteban Talavera [Mon, 17 Jul 2017 16:27:30 +0000 (16:27 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
am:
daa1539a5e
Change-Id: I30d024c2d4e11f4e4c246b123723a00d28af78ee
TreeHugger Robot [Mon, 17 Jul 2017 16:14:44 +0000 (16:14 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
Beverly [Mon, 17 Jul 2017 16:13:34 +0000 (16:13 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev
am:
47e4fde159
Change-Id: Ic154e4fea33cbec26407598325c44a4dcbbcceb7
TreeHugger Robot [Mon, 17 Jul 2017 15:59:04 +0000 (15:59 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev
Geoffrey Pitsch [Fri, 14 Jul 2017 13:55:16 +0000 (09:55 -0400)]
Delay marquee scrolling on lockscreen by 2 seconds.
Starting too quickly makes it hard to see the beginning.
Test: manual
Change-Id: I203a65856c27f9e23f2e091669ac7b0ae1c114d9
Fixes:
21976443
Geoffrey Pitsch [Mon, 17 Jul 2017 13:31:55 +0000 (09:31 -0400)]
Remove Keyguard owner info from RelativeLayout.
Altering other elements in the layout was forcing unnecessary
changes on the marquee scrolling.
Fixes:
62400546
Test: manual
Change-Id: Ib9cccb91b6a95e614917eacfddb91624aea3ba27
Benjamin Miller [Mon, 17 Jul 2017 14:38:56 +0000 (14:38 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am:
ca007e525b
am:
2ecc198877
Change-Id: I6d74a3bd8e7c84f4f2a571f83888a0f9d485dc27
Benjamin Miller [Mon, 17 Jul 2017 14:32:30 +0000 (14:32 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am:
ca007e525b
am:
3082216de2
Change-Id: Id9720c51f6192831ede99fd0af0451b43026e663
Wyatt Riley [Mon, 17 Jul 2017 14:28:33 +0000 (14:28 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev
am:
bd2d9f8fdf
Change-Id: I414ff67d392f5d11a2b5919556ceff6fc6e1b393
Benjamin Miller [Mon, 17 Jul 2017 14:23:25 +0000 (14:23 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am:
ca007e525b
Change-Id: If2a06d8e8e5fe2034e22c86dabf68bf7d3f79bb0
Benjamin Miller [Mon, 17 Jul 2017 14:22:24 +0000 (14:22 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am:
ca007e525b
Change-Id: Ife96d44a6c8687be49616562f1834c1e2cc17b7d
TreeHugger Robot [Mon, 17 Jul 2017 14:21:01 +0000 (14:21 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 14:11:55 +0000 (14:11 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
Esteban Talavera [Fri, 14 Jul 2017 15:14:07 +0000 (16:14 +0100)]
Enforce policy for camera gesture in keyguard
If the admin has disabled the camera for secure
keyguards, in addition to removing the bottom-right hand
corner camera button do not allow the camera to be opened
via the camera gesture either.
Bug:
63334090
Test: Manually tested launching the camera on secure and non-secure keyguard and non-keyguard, both via camera icon and gesture
Change-Id: I104688eaad719528376e2851f837d5956a6a1169
Beverly [Wed, 12 Jul 2017 14:58:22 +0000 (10:58 -0400)]
Added check for AOD before showing volume dialog.
Fixes:
62598406
Test: runtest systemui
Change-Id: I407eed0e0559ef0bc61d36ad9c5e84c6924c161e
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 11:02:55 +0000 (11:02 +0000)]
Merge "Track libcore commit
58228b82c64808eddac02736f18f5003730443a0" am:
29926838d4 am:
40dfadda77
am:
004ae3ae71
Change-Id: I74a0d7f3623bb1e6fdf6142a702c0e5dcfe1d5ee
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:55:37 +0000 (10:55 +0000)]
Merge "Track libcore commit
58228b82c64808eddac02736f18f5003730443a0" am:
29926838d4
am:
40dfadda77
Change-Id: I8b74cd195f4133e478a63ad2066856ebe32b6231
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:48:50 +0000 (10:48 +0000)]
Merge "Track libcore commit
58228b82c64808eddac02736f18f5003730443a0"
am:
29926838d4
Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:37:35 +0000 (10:37 +0000)]
Philip Cuadra [Sun, 16 Jul 2017 22:52:03 +0000 (22:52 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev
am:
f54dbc5253 -s ours
Change-Id: Ic1ec1459c003c9a0c0f0c2a807b147a14a511af3
TreeHugger Robot [Sun, 16 Jul 2017 22:45:29 +0000 (22:45 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev
Lorenzo Colitti [Sun, 16 Jul 2017 07:48:56 +0000 (07:48 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
am:
a77bc91b55 -s ours
Change-Id: Ib184bce22c6d4e94983f5a2ad9ddc21cd1c5392a
Lorenzo Colitti [Sun, 16 Jul 2017 07:38:12 +0000 (07:38 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
Lorenzo Colitti [Sat, 15 Jul 2017 19:44:46 +0000 (19:44 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
am:
90bf56da0d
Change-Id: If16c79d6b999a413f991234907cd92403269c8a8
Lorenzo Colitti [Sat, 15 Jul 2017 19:38:00 +0000 (19:38 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
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 oc-dr1-dev-plus-aosp because of previous
cherry picks and incorrect Merged-In annotations)
Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
Merged-In: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
Maurice Lam [Sat, 15 Jul 2017 15:01:13 +0000 (15:01 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev
am:
43e249ff27
Change-Id: Ifa239877c607468fe4ca9bdb87f712b10633762b
TreeHugger Robot [Sat, 15 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev
Android Build Merger (Role) [Fri, 14 Jul 2017 23:21:19 +0000 (23:21 +0000)]
Merge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5 am:
6c5ee3d894" into oc-dr1-dev-plus-aosp
Peng Xu [Fri, 14 Jul 2017 23:19:52 +0000 (23:19 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5
am:
6c5ee3d894
Change-Id: If3d4bc3338c4baec3c79512140321b65e7ef949f
Peng Xu [Fri, 14 Jul 2017 23:18:30 +0000 (23:18 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5
am:
7bef937503
Change-Id: I108570f80973c02be45ea450747ffbb8cd0e094d
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am:
17e641dae5
Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am:
17e641dae5
Change-Id: I4391dafa9d153213e35ac58bceb8d2f4c958fde0
TreeHugger Robot [Fri, 14 Jul 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
OSDN Git Service
