OSDN Git Service
Shishir Agrawal [Tue, 27 Jun 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6 am:
78b024cb08" into oc-dr1-dev-plus-aosp
am:
c999d0d55d
Change-Id: Idbd6637c5ca5316dd983a421679271eeeef9a083
Bill Yi [Tue, 27 Jun 2017 20:23:33 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
8d16bcef26 -s ours
am:
b07d972011 -s ours
Change-Id: I01af0181ba1ebdcc1101f4a6234c0d29459a50a2
Bill Yi [Tue, 27 Jun 2017 20:21:59 +0000 (20:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2619c76cb1 -s ours
am:
00d60d3076 -s ours
Change-Id: Ibfdc84594e644923ee2a894335ca9ff9bb5bf67c
Bill Yi [Tue, 27 Jun 2017 20:16:27 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours am:
503eab4469 -s ours
am:
ded6d159cc -s ours
Change-Id: I4aeb90be346036977929a62605b5c82050cbb36a
Android Build Merger (Role) [Tue, 27 Jun 2017 20:13:49 +0000 (20:13 +0000)]
Merge "Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6 am:
78b024cb08" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 27 Jun 2017 20:12:54 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
8d16bcef26 -s ours
Change-Id: I2282f0ab89638dce50ed3c6b3ad66604bfe4c1ee
Shishir Agrawal [Tue, 27 Jun 2017 20:12:32 +0000 (20:12 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6
am:
78b024cb08
Change-Id: I688c0d626be99fb1229d4b89e3f1bbdd62bc1c49
Bill Yi [Tue, 27 Jun 2017 20:11:39 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2619c76cb1 -s ours
Change-Id: Ibcb59e3ae4e87301aa97fd7f7f3e93c64a2ef0f3
Bill Yi [Tue, 27 Jun 2017 20:10:11 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
852e0aacc2 -s ours
am:
ed8860238c -s ours
Change-Id: Ic97752e1d08ed4f9e8a9b914608f170f48cdc292
Bill Yi [Tue, 27 Jun 2017 20:06:09 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours
am:
503eab4469 -s ours
Change-Id: I4144956fc0670fb706b11348ae140c122cde81a7
Shishir Agrawal [Tue, 27 Jun 2017 20:05:04 +0000 (20:05 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I879ad445f1dd1a2c39e71dd29bf155865318eead
Bill Yi [Tue, 27 Jun 2017 20:02:19 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
852e0aacc2 -s ours
Change-Id: Ic393c2f71f4f0d5fe201936acaeded3be9c741d5
Bill Yi [Tue, 27 Jun 2017 19:59:48 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: Iebd88570c6104dceaa4344c0ab2f53f354fa0ba9
TreeHugger Robot [Tue, 27 Jun 2017 19:57:57 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:54:14 +0000 (19:54 +0000)]
Merge "Fixes grammatical error in InputMethodManager doc"
TreeHugger Robot [Tue, 27 Jun 2017 19:51:15 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Shishir Agrawal [Tue, 27 Jun 2017 19:50:37 +0000 (19:50 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:50:30 +0000 (19:50 +0000)]
Merge changes Ie5c878d3,I33d9be04
* changes:
Remove forward-lock install tests
Use PackageInstaller
TreeHugger Robot [Tue, 27 Jun 2017 19:49:42 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 27 Jun 2017 19:49:03 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:44:47 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:38:10 +0000 (19:38 +0000)]
Merge "Update brightness icon to rounded one"
TreeHugger Robot [Tue, 27 Jun 2017 19:32:39 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 27 Jun 2017 19:20:29 +0000 (19:20 +0000)]
Merge "reflect errors to child package"
TreeHugger Robot [Tue, 27 Jun 2017 19:14:59 +0000 (19:14 +0000)]
Merge "Restore behavior of isUserRunning"
Android Build Merger (Role) [Tue, 27 Jun 2017 19:13:58 +0000 (19:13 +0000)]
Merge "Merge "Scrim opacity" into oc-dr1-dev am:
ce2ebd1285 am:
3e36e13cfa"
Lucas Dupin [Tue, 27 Jun 2017 19:13:07 +0000 (19:13 +0000)]
Merge "Scrim opacity" into oc-dr1-dev am:
ce2ebd1285
am:
3e36e13cfa
Change-Id: I408238eff55b469ff0407c72c504e4e1adcc9b8b
Android Build Merger (Role) [Tue, 27 Jun 2017 19:12:28 +0000 (19:12 +0000)]
Merge "Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev am:
be6989cb9d am:
018e031d5d"
Jean-Michel Trivi [Tue, 27 Jun 2017 19:11:20 +0000 (19:11 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev am:
be6989cb9d
am:
018e031d5d
Change-Id: Ia28b0fcd08435f1ba98d1f1d6299f88d1afea8e5
Jeff Sharkey [Tue, 27 Jun 2017 19:10:55 +0000 (19:10 +0000)]
Merge "Only require that system UIDs tag their sockets."
Android Build Merger (Role) [Tue, 27 Jun 2017 19:08:41 +0000 (19:08 +0000)]
Merge "Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev am:
214baa034a am:
0d74be5e83"
Mady Mellor [Tue, 27 Jun 2017 19:07:45 +0000 (19:07 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev am:
214baa034a
am:
0d74be5e83
Change-Id: Ide6ede97ae30fab4c53b1b2f405460384e24d6d1
Android Build Merger (Role) [Tue, 27 Jun 2017 19:07:19 +0000 (19:07 +0000)]
Merge "Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
77b001f910" into oc-dr1-dev-plus-aosp am:
a678041929"
Julius D'souza [Tue, 27 Jun 2017 19:06:21 +0000 (19:06 +0000)]
Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
77b001f910" into oc-dr1-dev-plus-aosp
am:
a678041929
Change-Id: Ibc380313251a94fdabdeac4b9d856887b664d3d8
Android Build Merger (Role) [Tue, 27 Jun 2017 19:05:41 +0000 (19:05 +0000)]
Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
21c7490f20 am:
29af0f0b45"
Julius D'souza [Tue, 27 Jun 2017 19:04:48 +0000 (19:04 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
21c7490f20
am:
29af0f0b45
Change-Id: If038e3ced85f6cfb08cf6f20e80f05da9f948848
Android Build Merger (Role) [Tue, 27 Jun 2017 19:04:10 +0000 (19:04 +0000)]
Merge "Merge "Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09 am:
1de1c2bb66 am:
8f2950b2c4" into oc-dr1-dev-plus-aosp am:
d0b5ca2e26"
Brad Ebinger [Tue, 27 Jun 2017 19:03:11 +0000 (19:03 +0000)]
Merge "Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09 am:
1de1c2bb66 am:
8f2950b2c4" into oc-dr1-dev-plus-aosp
am:
d0b5ca2e26
Change-Id: Ie3b0ba66d5e954a2d2c23c70a0d35ea1b7660670
Android Build Merger (Role) [Tue, 27 Jun 2017 19:02:27 +0000 (19:02 +0000)]
Merge "Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev am:
9747b4ace5 am:
f251056e0d"
Lucas Dupin [Tue, 27 Jun 2017 19:02:05 +0000 (19:02 +0000)]
Merge "Scrim opacity" into oc-dr1-dev
am:
ce2ebd1285
Change-Id: Idf63df1a75f5db96d2129cac17c0189edeff46a7
Siyamed Sinir [Tue, 27 Jun 2017 19:01:46 +0000 (19:01 +0000)]
Merge "Migrate core TextView tests to JUnit4"
Alex Sakhartchouk [Tue, 27 Jun 2017 19:01:33 +0000 (19:01 +0000)]
Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev am:
9747b4ace5
am:
f251056e0d
Change-Id: I04d20a7cec15e321efd688b0dd7a5c740033cd99
Android Build Merger (Role) [Tue, 27 Jun 2017 19:00:54 +0000 (19:00 +0000)]
Merge "Merge "Enable getting text_color_primary via Java." into oc-dr1-dev am:
29d430c5cc am:
b7f44dfce9"
TreeHugger Robot [Tue, 27 Jun 2017 19:00:20 +0000 (19:00 +0000)]
Merge "Strip extenders on android go devices."
Andrew Sapperstein [Tue, 27 Jun 2017 18:59:22 +0000 (18:59 +0000)]
Merge "Enable getting text_color_primary via Java." into oc-dr1-dev am:
29d430c5cc
am:
b7f44dfce9
Change-Id: I1602e0d3fa6c42628e87720dae056757fc924bf3
Jean-Michel Trivi [Tue, 27 Jun 2017 18:55:39 +0000 (18:55 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev
am:
be6989cb9d
Change-Id: Icd3d46d60cdf8353690f3284b73f0adaaf50c9b8
TreeHugger Robot [Tue, 27 Jun 2017 18:53:45 +0000 (18:53 +0000)]
Merge "Scrim opacity" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 18:46:24 +0000 (18:46 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Add a stop user stress test"
Nick Felker [Mon, 26 Jun 2017 22:50:19 +0000 (15:50 -0700)]
Fixes grammatical error in InputMethodManager doc
Fixes:
29645208
Test: This is not a code change, so tests should be unaffected.
Change-Id: I8b76166f3a7f1c825dc9725f6d7fd8e8c96fe410
Udam Saini [Tue, 27 Jun 2017 17:59:09 +0000 (17:59 +0000)]
Merge "Adds necessary permissions to system apis"
Mady Mellor [Tue, 27 Jun 2017 17:54:58 +0000 (17:54 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev
am:
214baa034a
Change-Id: Id0422df61723072291d37a6b19dc8bf783c8d2d8
TreeHugger Robot [Tue, 27 Jun 2017 17:45:48 +0000 (17:45 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev
Shishir Agrawal [Mon, 26 Jun 2017 19:06:03 +0000 (12:06 -0700)]
Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes:
62795179
Test: NetworkControllerSignalTest
Evan Laird [Tue, 27 Jun 2017 17:33:40 +0000 (13:33 -0400)]
Update brightness icon to rounded one
Just an asset drop
Test: visual
Bug:
62668861
Change-Id: I11c8ddd99de90c319143292cd32441d14eb7fc1d
Tomasz Wasilczyk [Tue, 27 Jun 2017 17:31:58 +0000 (17:31 +0000)]
Merge "Fix Broadcast Radio test to not fail on HD Radio."
Android Build Merger (Role) [Tue, 27 Jun 2017 17:27:26 +0000 (17:27 +0000)]
Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
77b001f910" into oc-dr1-dev-plus-aosp
Julius D'souza [Tue, 27 Jun 2017 17:26:29 +0000 (17:26 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98
am:
77b001f910
Change-Id: I5e98bc1085004caefaacf93fc1e628090dda359a
Julius D'souza [Tue, 27 Jun 2017 17:26:25 +0000 (17:26 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98
am:
21c7490f20
Change-Id: I90bff1339549ea67176e605cef3b8c7d0071522f
Julius D'souza [Tue, 27 Jun 2017 17:20:53 +0000 (17:20 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours
am:
c994b07e98
Change-Id: I8f95bc993be88d219e5a736ac8bbab51bc7e1c36
Julius D'souza [Tue, 27 Jun 2017 17:20:51 +0000 (17:20 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours
am:
c994b07e98
Change-Id: I5f1b5b203b157c2c4475fc61e3d7daff6fa3f7ad
Julia Reynolds [Mon, 26 Jun 2017 21:15:14 +0000 (17:15 -0400)]
Strip extenders on android go devices.
Test: runtest notification-systemui
Bug:
35219985
Change-Id: I5a2d25c4ea33510c397b351d3604bd3f23f81521
Julius D'souza [Tue, 27 Jun 2017 17:14:51 +0000 (17:14 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours
am:
1cd816eeac -s ours
Change-Id: I1535c1bc21f6c1eaa00787eb2b26a6085f7b69f7
Jeff Sharkey [Tue, 27 Jun 2017 17:01:36 +0000 (11:01 -0600)]
Only require that system UIDs tag their sockets.
Apps with a normal UID are typically isolated enough to not require
socket tagging; we're mostly interested in tracking down internal
UIDs that have lots of code sharing the same UID.
Also fix up everyone doing manual string checks of Build.TYPE, since
we now have first-class fields for those.
Bug:
38126076
Test: builds, boots
Change-Id: I3a40348196bd8459289f2b9355d9783a07f1e7dd
Android Build Merger (Role) [Tue, 27 Jun 2017 17:09:52 +0000 (17:09 +0000)]
Merge "Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09 am:
1de1c2bb66 am:
8f2950b2c4" into oc-dr1-dev-plus-aosp
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09 am:
1de1c2bb66
am:
8f2950b2c4
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Julius D'souza [Tue, 27 Jun 2017 17:08:48 +0000 (17:08 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
am:
789954fb69 -s ours
Change-Id: I049ea4d9b8a12740d4a62e2224dbd28dcedc72ba
Alex Sakhartchouk [Tue, 27 Jun 2017 17:08:26 +0000 (17:08 +0000)]
Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev
am:
9747b4ace5
Change-Id: I5e5ad0d619a844b445f21bc0272b5cdcf5604b78
Andrew Sapperstein [Tue, 27 Jun 2017 17:04:31 +0000 (17:04 +0000)]
Merge "Enable getting text_color_primary via Java." into oc-dr1-dev
am:
29d430c5cc
Change-Id: If277d10980304fd589d5aaa66e25a10a2e95681f
Brad Ebinger [Tue, 27 Jun 2017 17:02:53 +0000 (17:02 +0000)]
Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09
am:
1de1c2bb66
Change-Id: I7901ec8b6e844d29a7c69a3570aaa10baa9c1419
Todd Kennedy [Tue, 27 Jun 2017 17:02:35 +0000 (10:02 -0700)]
reflect errors to child package
Change-Id: I387b7dc4729b099a4064fbe10e9d949a8a7c340c
Fixes:
63055904
Test: install test and see that the system server does not restart
Test: adb install -r -g out/target/product/sailfish/data/app/FrameworkCoreTests_install_multi_package/FrameworkCoreTests_install_multi_package.apk
TreeHugger Robot [Tue, 27 Jun 2017 16:59:33 +0000 (16:59 +0000)]
Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev
Brad Ebinger [Tue, 27 Jun 2017 16:57:11 +0000 (16:57 +0000)]
Merge "IMS: Check for binderstate before calling endSession"
am:
c49534cf09
Change-Id: I9d173693c466b7d8512d11f266af48f5307669d5
TreeHugger Robot [Tue, 27 Jun 2017 16:53:52 +0000 (16:53 +0000)]
Merge "Enable getting text_color_primary via Java." into oc-dr1-dev
Tony Mak [Thu, 1 Jun 2017 10:02:59 +0000 (11:02 +0100)]
Add a stop user stress test
Start / stop user 10 times in a row, make sure the user is stopped
in a reasonable amount of time.
Test: bit FrameworksServicesTests:com.android.server.pm.UserLifecycleStressTest
Bug:
62096041
Change-Id: I7f7e460a4b50c380d9028d2b09d5cf6e279ac6f1
Siyamed Sinir [Fri, 16 Jun 2017 22:24:00 +0000 (15:24 -0700)]
Migrate core TextView tests to JUnit4
Test: bit FrameworksCoreTests:android.widget.EditorCursorTest
bit -t FrameworksCoreTests:android.widget.TextViewActivityMouseTest
bit -t FrameworksCoreTests:android.widget.TextViewActivityTest
bit -t FrameworksCoreTests:android.widget.TextViewPerformanceTest
bit -t FrameworksCoreTests:android.widget.TextViewTest
Bug:
31223263
Change-Id: Ib7cc4267b3c9a631aae1d4dd7b18f51d94d3c3ae
Brad Ebinger [Tue, 27 Jun 2017 16:46:57 +0000 (16:46 +0000)]
Merge "IMS: Check for binderstate before calling endSession"
TreeHugger Robot [Tue, 27 Jun 2017 16:37:41 +0000 (16:37 +0000)]
Merge "Use DisplayListener instead of WindowRotationListener in AudioService."
TreeHugger Robot [Tue, 27 Jun 2017 16:15:37 +0000 (16:15 +0000)]
Merge changes Ie79ce57c,I003dd7c9,Ibb0f4504
* changes:
Assume virtual devices always have USB connection.
Allocate well-known tag for app store updates.
Add @TestApi for StrictMode tests.
TreeHugger Robot [Tue, 27 Jun 2017 16:11:37 +0000 (16:11 +0000)]
Merge "Log calling UID/PID when UriPermissions change."
Zak Cohen [Tue, 27 Jun 2017 16:00:23 +0000 (16:00 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev am:
d20db5a0bd
am:
a45febf1fa
Change-Id: I5f1bfd486c0ab87f8a09ee8b0283faeb5513aa7b
Zak Cohen [Tue, 27 Jun 2017 15:54:51 +0000 (15:54 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
am:
d20db5a0bd
Change-Id: Idf9600ba1aa8de0a43f146425afdc9485391c12d
TreeHugger Robot [Tue, 27 Jun 2017 15:47:50 +0000 (15:47 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 15:17:17 +0000 (15:17 +0000)]
Merge "Clean up USB*Manager."
Julius D'souza [Tue, 27 Jun 2017 13:48:51 +0000 (06:48 -0700)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
Bug:
62038345
Change-Id: I4b86a1b9ab56f560e863663b9f89195ae1187ab4
Kenny Guy [Tue, 27 Jun 2017 13:16:05 +0000 (13:16 +0000)]
Merge "Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683 am:
9f84093386" into oc-dr1-dev-plus-aosp
am:
89244a76d3
Change-Id: I900b07e36599a27f194919a8109f2181586c1419
Kenny Guy [Tue, 27 Jun 2017 13:14:44 +0000 (13:14 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683 am:
8954507d8c
am:
3dce99c9ab
Change-Id: I74082e88a32ed57ee4030fa072983449005397ce
Android Build Merger (Role) [Tue, 27 Jun 2017 13:10:28 +0000 (13:10 +0000)]
Merge "Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683 am:
9f84093386" into oc-dr1-dev-plus-aosp
Kenny Guy [Tue, 27 Jun 2017 13:09:42 +0000 (13:09 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683
am:
8954507d8c
Change-Id: I4688c240fbed0e82caf114579ed2e6f5946e0ee0
Kenny Guy [Tue, 27 Jun 2017 13:09:39 +0000 (13:09 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683
am:
9f84093386
Change-Id: I337bdeba957957414eaad3f981488fc8d8ebbd32
Kenny Guy [Tue, 27 Jun 2017 13:04:36 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: I80adc11fae6eb7ed72c1f304a560e2a5c9f93108
Kenny Guy [Tue, 27 Jun 2017 13:04:35 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: Ib663cf469da3b1cc5c41b385302db3c107290d23
TreeHugger Robot [Tue, 27 Jun 2017 12:55:39 +0000 (12:55 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
Bill Yi [Tue, 27 Jun 2017 12:46:48 +0000 (05:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie9db11e5a9cc8bdd0108e749ac785eb5a3664a6f
Auto-generated-cl: translation import
Rubin Xu [Tue, 27 Jun 2017 12:41:38 +0000 (12:41 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev am:
23ed7d7699
am:
87b90a1950
Change-Id: Ic2a320acaf707809bbff0ae54d5fa1521cadf299
Rubin Xu [Tue, 27 Jun 2017 12:36:10 +0000 (12:36 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
am:
23ed7d7699
Change-Id: I5a1315765c6b0dca3c7ffca914a56a34bffd0f44
TreeHugger Robot [Tue, 27 Jun 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
Neil Fuller [Tue, 27 Jun 2017 12:21:37 +0000 (12:21 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e am:
4fee968fa8 am:
dbe6beb0bb
am:
90b6995cd2
Change-Id: I24e9d58e1736d791dca26e124b714c98ef1f3914
Neil Fuller [Tue, 27 Jun 2017 12:16:20 +0000 (12:16 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e am:
4fee968fa8
am:
dbe6beb0bb
Change-Id: Ie3c352bc87cf6cd74a1e073efe4a99b518b133e4
Neil Fuller [Tue, 27 Jun 2017 12:10:37 +0000 (12:10 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e
am:
4fee968fa8
Change-Id: I042861293371d07f62b05b28dc7c3a2ffb090812
OSDN Git Service
