OSDN Git Service
Charles He [Sat, 2 Sep 2017 14:27:16 +0000 (15:27 +0100)]
AM: refactor LockTask whitelist update logic.
Previously, ActivityManagerService owned the LockTask package whitelist,
whereas LockTaskController contained the update logic. In this refactor,
we simplify the structure by moving the whitelist into LockTaskController.
We also add instrumentation tests to verify this behavior.
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Test: runtest frameworks-services
Test: go/wm-smoke
Test: cts-tradefed run cts-dev -m DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Bug:
63909481
Change-Id: I15ef4a446de800336f2bf9cbbd4acf6685e29320
Rubin Xu [Thu, 7 Sep 2017 13:04:28 +0000 (13:04 +0000)]
Merge "Always add local subnet routes to the interface's routing table" am:
981228be38 am:
5fb26a1270 am:
e3469a426e
am:
90f104931a
Change-Id: I704f9895ddd4c4fc2ab50a927939aee67a916fae
TreeHugger Robot [Thu, 7 Sep 2017 13:02:22 +0000 (13:02 +0000)]
Merge "Emit text direction with selection rectangle"
Rubin Xu [Thu, 7 Sep 2017 12:55:58 +0000 (12:55 +0000)]
Merge "Always add local subnet routes to the interface's routing table" am:
981228be38 am:
5fb26a1270
am:
e3469a426e
Change-Id: I21f4231c968b37cdcf1565279eedfb990dbc583b
fionaxu [Thu, 7 Sep 2017 12:47:28 +0000 (12:47 +0000)]
resolve merge conflicts of
6c7ef2e8d753 to stage-aosp-master am:
619e5c8ecc am:
c0d6acf08c -s ours
am:
e7644a022c -s ours
Change-Id: I503326b282a1a2c3a5cdc1d89abb2e2e6d7d5fbe
Sujith Ramakrishnan [Thu, 7 Sep 2017 12:39:06 +0000 (12:39 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am:
c07c23b1f7 -s ours am:
1255f26551 am:
b04db40842
am:
845c0cf812
Change-Id: I8aff50265f48590f3549ac5fdb7f0256dc476132
Rubin Xu [Thu, 7 Sep 2017 12:38:56 +0000 (12:38 +0000)]
Merge "Always add local subnet routes to the interface's routing table" am:
981228be38
am:
5fb26a1270
Change-Id: I3e0aa03b46b77bd65aa301fec28f4f6ab5de5c62
Jason Monk [Thu, 7 Sep 2017 12:26:28 +0000 (08:26 -0400)]
resolve merge conflicts of
64e19de569ac to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I485e2fd5ef4e449223e1c095652ee5b596a8d77c
Rubin Xu [Thu, 7 Sep 2017 12:25:05 +0000 (12:25 +0000)]
Merge "Always add local subnet routes to the interface's routing table"
am:
981228be38
Change-Id: I0b1728fae18c891d91fafdfbb1905c05e0fea47f
Rubin Xu [Thu, 7 Sep 2017 12:12:09 +0000 (12:12 +0000)]
Merge "Always add local subnet routes to the interface's routing table"
Rubin Xu [Tue, 5 Sep 2017 17:40:49 +0000 (18:40 +0100)]
Always add local subnet routes to the interface's routing table
For some networks such as mobile data connections, its LinkProperties
does not contain routes for the local subnet so no such route is added
to the interface's routing table. This can be problematic especially
if the device is in VPN lockdown mode where there exists high-priority
PROHIBIT routing rule which in turn blocks the network's default gateway
route from being added (next hop address hitting the prohibit rule).
We fix this by patching LinkProperties to always include direct connected routes
when they are received by ConnectivityService. This has the added advantage that
when apps get LinkProperties, they see the directly connected routes as well.
Bug:
63662962
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: Start with device with mobile data, set up ics-OpenVPN in always-on
lockdown mode. Turn off mobile data then turn it back on, observe
mobile data connectivity is restored and VPN successfully reconnects.
Change-Id: I35b614eebccfd22c4a5270f40256f9be1e25abfb
fionaxu [Thu, 7 Sep 2017 08:24:55 +0000 (08:24 +0000)]
resolve merge conflicts of
6c7ef2e8d753 to stage-aosp-master am:
619e5c8ecc
am:
c0d6acf08c -s ours
Change-Id: Ic2110b1e658b345c9712f92411159fa9a059c4e9
fionaxu [Thu, 7 Sep 2017 08:15:48 +0000 (08:15 +0000)]
resolve merge conflicts of
6c7ef2e8d753 to stage-aosp-master
am:
619e5c8ecc
Change-Id: Id0a086a966c121fa850bb1c8748f1565ef6d1b82
fionaxu [Thu, 7 Sep 2017 05:57:32 +0000 (22:57 -0700)]
resolve merge conflicts of
6c7ef2e8d753 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205
TreeHugger Robot [Thu, 7 Sep 2017 04:44:57 +0000 (04:44 +0000)]
Merge "Change score cache eviction time to settings value."
TreeHugger Robot [Thu, 7 Sep 2017 04:13:54 +0000 (04:13 +0000)]
Merge "Remove dependency on platform-system-robolectric"
Sujith Ramakrishnan [Thu, 7 Sep 2017 02:21:57 +0000 (02:21 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am:
c07c23b1f7 -s ours am:
1255f26551
am:
b04db40842
Change-Id: Ie37e24c2d5817902d467ac6a4669b8c21607831e
Sujith Ramakrishnan [Thu, 7 Sep 2017 02:12:29 +0000 (02:12 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am:
c07c23b1f7 -s ours
am:
1255f26551
Change-Id: If99689b79fa86283bf198412ef506c91d3ffb1ab
Sujith Ramakrishnan [Thu, 7 Sep 2017 01:59:58 +0000 (01:59 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev
am:
c07c23b1f7 -s ours
Change-Id: I87c316c7b1738e9a85b867088a074536bc5e9db1
Jeff Sharkey [Thu, 7 Sep 2017 01:10:26 +0000 (01:10 +0000)]
Merge "Start paving the way for vold calls over Binder."
Sundeep Ghuman [Tue, 29 Aug 2017 00:04:16 +0000 (17:04 -0700)]
Change score cache eviction time to settings value.
Reduce default eviction time from intended 24 hours (erroneously input
as 24 days) to 20 minutes.
Bug: b/
63073866
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
Sujith Ramakrishnan [Thu, 7 Sep 2017 00:09:21 +0000 (00:09 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev
Treehugger Robot [Wed, 6 Sep 2017 23:53:48 +0000 (23:53 +0000)]
Merge "disable carrier actions on redirection by default"
TreeHugger Robot [Wed, 6 Sep 2017 23:12:45 +0000 (23:12 +0000)]
Merge "Add ACTIVITY_TYPE and STACK_ID constants to Test API"
TreeHugger Robot [Wed, 6 Sep 2017 23:12:00 +0000 (23:12 +0000)]
Merge "Convert Activity and WindowManager Tests to Device Side"
Steven Timotius [Tue, 5 Sep 2017 22:46:29 +0000 (15:46 -0700)]
Add ACTIVITY_TYPE and STACK_ID constants to Test API
These constants will be used by ActivityManagerTestBase
Test: cts-tradefed run commandAndExit cts-dev --module CtsActivityManagerDeviceTestCases
Change-Id: I0f0265edfa6d6b31592fa96bec58f857849932e0
TreeHugger Robot [Wed, 6 Sep 2017 22:53:07 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Dan Sandler [Wed, 6 Sep 2017 22:38:29 +0000 (22:38 +0000)]
Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev am:
66204a42cb
am:
966796a74f
Change-Id: I024b6a4ed2d268b60699f83dc8a1fea2435f794d
fionaxu [Wed, 6 Sep 2017 21:19:16 +0000 (14:19 -0700)]
disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Bug:
65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
Bill Yi [Wed, 6 Sep 2017 22:28:43 +0000 (22:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
018d1e066e -s ours" into oc-mr1-dev-plus-aosp
am:
b641261c97 -s ours
Change-Id: I0f739bb83d767065760ef5e631503a0e9c9ff39b
Adam Lesinski [Wed, 6 Sep 2017 22:23:30 +0000 (22:23 +0000)]
Merge "Merge "idmap: include idmap version in check for stale file" am:
609887a980 am:
a15992086c am:
d7f3a7b095" into oc-mr1-dev-plus-aosp
am:
9964aa9160
Change-Id: Ibeb55f3d4b7c10b1d192bbea06ce293509e695bb
Daniel Nishi [Wed, 6 Sep 2017 22:17:32 +0000 (22:17 +0000)]
Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev am:
5d340bce89
am:
942db56283
Change-Id: If093400dfe80cd544df151fb8ee90878a9eecf51
TreeHugger Robot [Wed, 6 Sep 2017 22:12:12 +0000 (22:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Wed, 6 Sep 2017 21:51:50 +0000 (21:51 +0000)]
Merge "Merge "Fix issue #
65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev am:
2556236f8e am:
9c869043e9"
Dianne Hackborn [Wed, 6 Sep 2017 21:47:50 +0000 (21:47 +0000)]
Merge "Fix issue #
65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev am:
2556236f8e
am:
9c869043e9
Change-Id: I61aba1578d6a24c3fcb67d88d43ae4d8334908ac
Android Build Merger (Role) [Wed, 6 Sep 2017 21:46:08 +0000 (21:46 +0000)]
Merge "Merge "idmap: suppress print for padded resources" am:
3949701c6f am:
4f4218a3be am:
aed3472304 am:
22720ffb5f"
Jason Monk [Wed, 6 Sep 2017 21:44:22 +0000 (21:44 +0000)]
Merge "Add metrics for status bar" into oc-mr1-dev
am:
69f3e18e0c
Change-Id: Ic6fccfd3113f62ea6b8cfee0be683515d0553df1
Mårten Kongstad [Wed, 6 Sep 2017 21:41:54 +0000 (21:41 +0000)]
Merge "idmap: suppress print for padded resources" am:
3949701c6f am:
4f4218a3be am:
aed3472304
am:
22720ffb5f
Change-Id: Ie2b9415ec77dbb80096050945546c0dc71798079
Android Build Merger (Role) [Wed, 6 Sep 2017 21:40:09 +0000 (21:40 +0000)]
Merge "Merge "Use raw string when setting wifi preference title." into oc-mr1-dev am:
8c3ce8d60b am:
523eb32dd0 -s ours"
Maurice Lam [Wed, 6 Sep 2017 21:38:07 +0000 (14:38 -0700)]
Remove dependency on platform-system-robolectric
Dependency on platform-system-robolectric is not needed when mockito
is not necessary.
If mockito is needed, add a static dependency on
mockito-robolectric-prebuilt.
Test: m RunFrameworksServicesRoboTests
Bug:
38456058
Change-Id: I60ac070125cf157225247561336288dfe97789c6
Dan Sandler [Wed, 6 Sep 2017 21:37:52 +0000 (21:37 +0000)]
Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev
am:
66204a42cb
Change-Id: Ibe018c874f24bb9b59ac412133262dfb31104fa6
Fan Zhang [Wed, 6 Sep 2017 21:35:06 +0000 (21:35 +0000)]
Merge "Use raw string when setting wifi preference title." into oc-mr1-dev am:
8c3ce8d60b
am:
523eb32dd0 -s ours
Change-Id: I2ba03f0b44cf4315c98fc30d3b487b26dff854dc
Android Build Merger (Role) [Wed, 6 Sep 2017 21:33:14 +0000 (21:33 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b1d8caa355 -s ours am:
5e1838a14e -s ours am:
47d1780be0 -s ours"
Jason Monk [Wed, 6 Sep 2017 21:29:08 +0000 (21:29 +0000)]
Merge "Add metrics for status bar" into oc-mr1-dev
Bill Yi [Wed, 6 Sep 2017 21:27:11 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b1d8caa355 -s ours am:
5e1838a14e -s ours
am:
47d1780be0 -s ours
Change-Id: I844b48110c247fc5bb1a316aa1468e59b4238ea8
Android Build Merger (Role) [Wed, 6 Sep 2017 21:25:27 +0000 (21:25 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
2c1d066618 -s ours" into oc-mr1-dev am:
8506d1085e -s ours am:
5d44e5c045 -s ours"
TreeHugger Robot [Wed, 6 Sep 2017 21:24:58 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 6 Sep 2017 21:21:52 +0000 (21:21 +0000)]
Merge "Import translations. DO NOT MERGE am:
2c1d066618 -s ours" into oc-mr1-dev am:
8506d1085e -s ours
am:
5d44e5c045 -s ours
Change-Id: I46f29fe3939885d22abfcb7d40d729fc5454eecf
Android Build Merger (Role) [Wed, 6 Sep 2017 21:19:10 +0000 (21:19 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
018d1e066e -s ours" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Wed, 6 Sep 2017 21:17:48 +0000 (21:17 +0000)]
Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev
Bill Yi [Wed, 6 Sep 2017 21:13:54 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
018d1e066e -s ours
Change-Id: Ia61c47578eeac9029f5a4bed15885700b3cc7e1c
Android Build Merger (Role) [Wed, 6 Sep 2017 21:12:29 +0000 (21:12 +0000)]
Merge "Merge "idmap: include idmap version in check for stale file" am:
609887a980 am:
a15992086c am:
d7f3a7b095" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 6 Sep 2017 21:11:29 +0000 (21:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b1d8caa355 -s ours am:
58ba7d4cde -s ours" into oc-mr1-dev-plus-aosp
am:
c8c4e5820b -s ours
Change-Id: Ie4570858fe2bd72844c39fff790cb213fb577def
Adam Lesinski [Wed, 6 Sep 2017 21:08:35 +0000 (21:08 +0000)]
Merge "idmap: include idmap version in check for stale file" am:
609887a980 am:
a15992086c
am:
d7f3a7b095
Change-Id: I7f580393d3eb044f69b9017c7528dd4e19a35aba
Daniel Nishi [Wed, 6 Sep 2017 21:06:38 +0000 (21:06 +0000)]
Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev
am:
5d340bce89
Change-Id: I0922506112f5ad943f827765c82b81a9287a52d7
Adam Lesinski [Wed, 6 Sep 2017 20:58:32 +0000 (20:58 +0000)]
Merge "idmap: include idmap version in check for stale file" am:
609887a980
am:
a15992086c
Change-Id: Ib8510f7a156ef71926b1e3f339aa4426981d4745
Dianne Hackborn [Wed, 6 Sep 2017 20:55:23 +0000 (20:55 +0000)]
Merge "Fix issue #
65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev
am:
2556236f8e
Change-Id: Ib3498106274ce5a0b832d4fd7f56396979f24a75
Bill Yi [Wed, 6 Sep 2017 20:54:15 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE"
Mårten Kongstad [Wed, 6 Sep 2017 20:37:29 +0000 (20:37 +0000)]
Merge "idmap: suppress print for padded resources" am:
3949701c6f am:
4f4218a3be
am:
aed3472304
Change-Id: Ie98121efacb6327e173b9de55aabe80120948864
Adam Lesinski [Wed, 6 Sep 2017 20:36:28 +0000 (20:36 +0000)]
Merge "idmap: include idmap version in check for stale file"
am:
609887a980
Change-Id: I4779cd92041fe33a95c0034c539c48989ca8e6df
Mårten Kongstad [Wed, 6 Sep 2017 20:25:27 +0000 (20:25 +0000)]
Merge "idmap: suppress print for padded resources" am:
3949701c6f
am:
4f4218a3be
Change-Id: I5f2d47c217152d47743b72e6082abf625d2425f8
Fan Zhang [Wed, 6 Sep 2017 20:24:13 +0000 (20:24 +0000)]
Merge "Use raw string when setting wifi preference title." into oc-mr1-dev
am:
8c3ce8d60b
Change-Id: I1ad0a6ab2a9c61ddc69095621bb080d4110cec09
Bill Yi [Wed, 6 Sep 2017 20:17:44 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b1d8caa355 -s ours
am:
5e1838a14e -s ours
Change-Id: I7bcf2a9b523f994d03f340374cf9a065b8dd4408
Mårten Kongstad [Wed, 6 Sep 2017 20:04:35 +0000 (20:04 +0000)]
Merge "idmap: suppress print for padded resources"
am:
3949701c6f
Change-Id: I5d92bdc11172159ea8ad95614e2b4d4535a48e45
TreeHugger Robot [Wed, 6 Sep 2017 20:04:30 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Daniel Nishi [Wed, 6 Sep 2017 19:58:22 +0000 (19:58 +0000)]
Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev
Bill Yi [Wed, 6 Sep 2017 19:55:47 +0000 (19:55 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
14b975a42d -s ours" into oc-mr1-dev-plus-aosp
am:
4c652d23b9 -s ours
Change-Id: I4756b57ed74a077851323d377762fc55a7fdd02b
Bill Yi [Wed, 6 Sep 2017 19:55:35 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE am:
2c1d066618 -s ours" into oc-mr1-dev
am:
8506d1085e -s ours
Change-Id: I903b6acd81570e10845deee5fd8a8f0edd669f40
TreeHugger Robot [Wed, 6 Sep 2017 19:54:00 +0000 (19:54 +0000)]
Merge "Fix issue #
65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev
Wale Ogunwale [Wed, 6 Sep 2017 19:52:44 +0000 (19:52 +0000)]
Merge "Introducing ConfigurationContainerListener"
Amith Yamasani [Wed, 6 Sep 2017 19:48:31 +0000 (19:48 +0000)]
Merge "Merge "Retry crashed bound foreground service with some delay" into oc-mr1-dev am:
3b0d11c887" into oc-mr1-dev-plus-aosp
am:
e455b425da
Change-Id: I718ddabbea63cd08c41e25f7cf60264b747b8b9d
Jeff Sharkey [Wed, 6 Sep 2017 19:47:03 +0000 (13:47 -0600)]
Start paving the way for vold calls over Binder.
This change is the bare minimum needed to connect to a new vold
Binder service and move the simple "reset" call over to go through
the new interface.
Test: builds, boots
Bug:
13758960
Change-Id: I2d8c406cd98728e5ac0a310e07048253ec8dce86
Android Build Merger (Role) [Wed, 6 Sep 2017 19:45:32 +0000 (19:45 +0000)]
Merge "Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am:
a11709b185 am:
044ddc2352" into oc-dr1-dev-plus-aosp am:
edc9bbc042 -s ours am:
72445ec608 -s ours"
Adam Lesinski [Wed, 6 Sep 2017 19:44:26 +0000 (19:44 +0000)]
Merge "idmap: include idmap version in check for stale file"
Colin Cross [Wed, 6 Sep 2017 19:41:05 +0000 (19:41 +0000)]
Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am:
a11709b185 am:
044ddc2352" into oc-dr1-dev-plus-aosp am:
edc9bbc042 -s ours
am:
72445ec608 -s ours
Change-Id: Ide336f9b9e2cb88bfcdab5add87d714b79a2b32b
Treehugger Robot [Wed, 6 Sep 2017 19:41:01 +0000 (19:41 +0000)]
Merge "idmap: suppress print for padded resources"
Android Build Merger (Role) [Wed, 6 Sep 2017 19:38:18 +0000 (19:38 +0000)]
Merge "Import translations. DO NOT MERGE am:
2c1d066618 -s ours am:
be2efcef20 -s ours am:
af00336df8 -s ours"
Android Build Merger (Role) [Wed, 6 Sep 2017 19:37:39 +0000 (19:37 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b1d8caa355 -s ours am:
58ba7d4cde -s ours" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Wed, 6 Sep 2017 19:33:50 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 6 Sep 2017 19:33:48 +0000 (19:33 +0000)]
Import translations. DO NOT MERGE am:
2c1d066618 -s ours am:
be2efcef20 -s ours
am:
af00336df8 -s ours
Change-Id: I2fe12cf18e7fb13847efb7c74c41ee55086fb9e1
Android Build Merger (Role) [Wed, 6 Sep 2017 19:33:26 +0000 (19:33 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
14b975a42d -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 6 Sep 2017 19:30:27 +0000 (19:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b1d8caa355 -s ours
am:
58ba7d4cde -s ours
Change-Id: Ia1dd108b926fa3701fff182fe74fae59dcc52783
Bill Yi [Wed, 6 Sep 2017 19:28:48 +0000 (19:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
14b975a42d -s ours
Change-Id: I8217d0c9f7ca6493177fd5560f00af2c44a3a4e2
TreeHugger Robot [Wed, 6 Sep 2017 19:28:12 +0000 (19:28 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 6 Sep 2017 19:26:56 +0000 (19:26 +0000)]
Merge "Use raw string when setting wifi preference title." into oc-mr1-dev
Android Build Merger (Role) [Wed, 6 Sep 2017 19:26:56 +0000 (19:26 +0000)]
Merge "Merge "Retry crashed bound foreground service with some delay" into oc-mr1-dev am:
3b0d11c887" into oc-mr1-dev-plus-aosp
Amith Yamasani [Wed, 6 Sep 2017 19:21:58 +0000 (19:21 +0000)]
Merge "Retry crashed bound foreground service with some delay" into oc-mr1-dev
am:
3b0d11c887
Change-Id: Iab480d4e7cf7173c74835f5f86f4b75516802796
Colin Cross [Wed, 6 Sep 2017 19:21:26 +0000 (19:21 +0000)]
Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am:
a11709b185 am:
044ddc2352" into oc-dr1-dev-plus-aosp
am:
edc9bbc042 -s ours
Change-Id: Ibe1c6a6bf8da887cfa555a8b613ec4078006c709
TreeHugger Robot [Wed, 6 Sep 2017 19:18:01 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 6 Sep 2017 19:14:09 +0000 (19:14 +0000)]
Import translations. DO NOT MERGE am:
2c1d066618 -s ours
am:
be2efcef20 -s ours
Change-Id: Icb2da595aa3f86ff54436fe76fdbe33cbb699dce
TreeHugger Robot [Wed, 6 Sep 2017 19:13:12 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 6 Sep 2017 19:13:07 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
b1d8caa355 -s ours
Change-Id: I61f891e2212e45fdeedc0daea7e620d812874d50
Bill Yi [Wed, 6 Sep 2017 19:10:33 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
b1d8caa355 -s ours
Change-Id: Ifd66f13f6b1384eae3f3697b7ac275c442386e0c
Android Build Merger (Role) [Wed, 6 Sep 2017 19:10:07 +0000 (19:10 +0000)]
Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am:
a11709b185 am:
044ddc2352" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 6 Sep 2017 19:07:57 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Wed, 6 Sep 2017 19:07:20 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE am:
2c1d066618 -s ours" into oc-mr1-dev
Android Build Merger (Role) [Wed, 6 Sep 2017 19:06:13 +0000 (19:06 +0000)]
Merge "Merge "Close idle connections to release RAM" into oc-mr1-dev am:
da49d05a8d am:
5ee20f2b92"
Colin Cross [Wed, 6 Sep 2017 19:05:24 +0000 (19:05 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources" am:
a11709b185
am:
044ddc2352
Change-Id: I8927f668751cd35d2445d281105417959202db54
TreeHugger Robot [Wed, 6 Sep 2017 19:04:54 +0000 (19:04 +0000)]
Merge "AAPT2: Debug::DumpXml display compiled attribute values."
TreeHugger Robot [Wed, 6 Sep 2017 19:03:51 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
OSDN Git Service
