OSDN Git Service
Peng Xu [Wed, 14 Jun 2017 06:36:20 +0000 (06:36 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:
d27d5d9ea8 am:
308aa4c846
am:
5c2479c7ab
Change-Id: If26280f5a68bc859a0f06ae18d3eb0bb8b2ea57c
Peng Xu [Wed, 14 Jun 2017 06:27:45 +0000 (06:27 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:
d27d5d9ea8
am:
308aa4c846
Change-Id: I90935ea2db530143daf3da44637b7cb97f9be2bd
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am:
d27d5d9ea8
Change-Id: Ib34a45b6fe35f27f4b3093888cbecd70b8b71300
Peng Xu [Wed, 14 Jun 2017 06:12:37 +0000 (06:12 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
gopinath [Wed, 14 Jun 2017 05:01:04 +0000 (05:01 +0000)]
App launch test apk change am:
0a2c9396a2 am:
8c64bf0edf
am:
a88f25b646
Change-Id: Ic6d3f9e6d920a0666104b82b79370f6ba715f1a3
gopinath [Wed, 14 Jun 2017 04:52:38 +0000 (04:52 +0000)]
App launch test apk change am:
0a2c9396a2 am:
4c81f3d412
am:
75b74a9056
Change-Id: Ifd74250be7b1372fe1449ac1fa55442293bfb829
gopinath [Wed, 14 Jun 2017 04:49:30 +0000 (04:49 +0000)]
App launch test apk change am:
0a2c9396a2
am:
8c64bf0edf
Change-Id: Ia90bdb8649c55d271a68d6c831dbd59cd8a4a21f
gopinath [Wed, 14 Jun 2017 04:45:04 +0000 (04:45 +0000)]
App launch test apk change am:
0a2c9396a2
am:
4c81f3d412
Change-Id: I6eab0fc584667f63dfa14de51f0c66b5494fb0f6
gopinath [Wed, 14 Jun 2017 04:39:30 +0000 (04:39 +0000)]
App launch test apk change
am:
0a2c9396a2
Change-Id: I2468cfc8f0db8c993ed0203d12bffb5abcd76305
gopinath [Wed, 14 Jun 2017 04:37:29 +0000 (04:37 +0000)]
App launch test apk change
am:
0a2c9396a2
Change-Id: Icad70c318aecfa28b985b7a7c737e332c9024ab8
Ying Xu [Wed, 14 Jun 2017 02:49:05 +0000 (02:49 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am:
70373f7928 am:
707dc81da1 am:
aaca44229b
am:
830b8ecab2
Change-Id: If2953e4ee5220809fdab50ddd4fc17c6ed80c3b4
Ying Xu [Wed, 14 Jun 2017 02:41:26 +0000 (02:41 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am:
70373f7928 am:
707dc81da1
am:
aaca44229b
Change-Id: I9656821a325d000dde93e05987c29c76609578bc
Ying Xu [Wed, 14 Jun 2017 02:33:41 +0000 (02:33 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am:
70373f7928
am:
707dc81da1
Change-Id: I37113bddb18b73dbf10b0dc9067dec9311338e86
Ying Xu [Wed, 14 Jun 2017 02:25:53 +0000 (02:25 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
am:
70373f7928
Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d
Ying Xu [Wed, 14 Jun 2017 02:16:51 +0000 (02:16 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
Lucas Dupin [Wed, 14 Jun 2017 02:15:18 +0000 (02:15 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev am:
2306a78963
am:
3d41a8df31
Change-Id: Ia710e1720c6c08d90dbf7581f9916eb1767fbfd9
Lucas Dupin [Wed, 14 Jun 2017 02:07:59 +0000 (02:07 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev
am:
2306a78963
Change-Id: Id542cb75499e2e1616e35ba067a431e3402a1f44
Kevin Chyn [Wed, 14 Jun 2017 02:00:29 +0000 (02:00 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev am:
6eacc1a4ba
am:
3164bf6743
Change-Id: I30ba4eac86bc92ac8013840f80a3645efba64d3e
TreeHugger Robot [Wed, 14 Jun 2017 01:57:53 +0000 (01:57 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev
Kevin Chyn [Wed, 14 Jun 2017 01:53:02 +0000 (01:53 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
am:
6eacc1a4ba
Change-Id: I16bac560e1ef3c20830f4bc79dca772da20032e7
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
TreeHugger Robot [Wed, 14 Jun 2017 01:37:28 +0000 (01:37 +0000)]
Merge "Expose USER_SETUP_COMPLETE as Test API."
TreeHugger Robot [Wed, 14 Jun 2017 01:23:06 +0000 (01:23 +0000)]
Merge "protect mIsolatedPackages access"
Yifan Hong [Wed, 14 Jun 2017 01:20:09 +0000 (18:20 -0700)]
SensorManager: attach background thread to JavaVM
Test: pass
Bug:
62404135
Change-Id: Ic3c0849cd366f550cbdccbb9bb8d082c5c570c35
Eugene Susla [Wed, 14 Jun 2017 00:42:08 +0000 (00:42 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am:
c041c7a34e am:
99f209be12
am:
f623be339c
Change-Id: Idc42c2e44c70e06dd56cd8a556ce91fb3cb10cea
Eugene Susla [Wed, 14 Jun 2017 00:39:58 +0000 (00:39 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am:
c041c7a34e am:
c26f789ae2
am:
dfa5272295
Change-Id: Ic68002087eacf339356e13e10698d88e1ff30c40
TreeHugger Robot [Wed, 14 Jun 2017 00:29:52 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Eugene Susla [Wed, 14 Jun 2017 00:29:15 +0000 (00:29 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am:
c041c7a34e
am:
99f209be12
Change-Id: Ia2e43979fb0e1687874e63249f829e221a1c47f7
Android Build Merger (Role) [Wed, 14 Jun 2017 00:25:28 +0000 (00:25 +0000)]
Merge "Merge "Add plugin hooks to DozeService" into oc-dr1-dev am:
644f8e8583 am:
a2521669b3"
TreeHugger Robot [Wed, 14 Jun 2017 00:24:59 +0000 (00:24 +0000)]
Merge "Import translations. DO NOT MERGE"
Mady Mellor [Wed, 14 Jun 2017 00:24:39 +0000 (00:24 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev am:
644f8e8583
am:
a2521669b3
Change-Id: I98935aecbd2158711787bbd7253eaea938c75c71
Eugene Susla [Wed, 14 Jun 2017 00:24:12 +0000 (00:24 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am:
c041c7a34e
am:
c26f789ae2
Change-Id: Ice5843da51415f87140a6311415a7074b155cdb3
Christopher Tate [Wed, 14 Jun 2017 00:19:51 +0000 (00:19 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787 am:
4c8dccf728
am:
9d9543de55
Change-Id: I27057df6948c0c0af46afa95e58c15b7014d733c
Eugene Susla [Wed, 14 Jun 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am:
c041c7a34e
Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e
Christopher Tate [Wed, 14 Jun 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787 am:
85c9638438" into oc-dr1-dev-plus-aosp
am:
2a96534f0e
Change-Id: I6905b808c339bef349aedef0acc63c0c2d1aeda4
Eugene Susla [Wed, 14 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am:
c041c7a34e
Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2
Adam Lesinski [Wed, 14 Jun 2017 00:13:13 +0000 (00:13 +0000)]
Merge "Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e am:
e9a4951c4d" into oc-dr1-dev-plus-aosp
am:
d622e7e538
Change-Id: I1f94c42cacd5cf90eed79be34dd2b3d42548e725
gopinath [Fri, 12 May 2017 22:37:37 +0000 (15:37 -0700)]
App launch test apk change
Support launching the app using the package name.
Remove the unused variables.
b/
33226470
Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314
(cherry picked from commit
a00259f47dc480f799a812a00f52e3c887aae4b0)
TreeHugger Robot [Wed, 14 Jun 2017 00:03:49 +0000 (00:03 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
Mady Mellor [Tue, 13 Jun 2017 23:59:15 +0000 (23:59 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev
am:
644f8e8583
Change-Id: Idfa991157c7885861a2fc51492175ca7e2b3bb08
Adam Lesinski [Tue, 13 Jun 2017 23:52:46 +0000 (23:52 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e am:
26cafd3e42
am:
6e54251a84
Change-Id: If2f275ff3f0b8d0114dbd7d4842d64ef8c1700e7
TreeHugger Robot [Tue, 13 Jun 2017 23:51:06 +0000 (23:51 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev
Christopher Tate [Tue, 13 Jun 2017 23:49:55 +0000 (23:49 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787
am:
4c8dccf728
Change-Id: I05d188c5b7ede54792b22d6c1445b32f4a63ed22
Winson Chung [Tue, 13 Jun 2017 23:49:25 +0000 (23:49 +0000)]
Merge "Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8 am:
8b5b0c2bfa" into oc-dr1-dev-plus-aosp
am:
2e214c441b
Change-Id: Ia17231c00fd0a78ea473c932765d66d487bb6095
Android Build Merger (Role) [Tue, 13 Jun 2017 23:45:54 +0000 (23:45 +0000)]
Merge "Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787 am:
85c9638438" into oc-dr1-dev-plus-aosp
Christopher Tate [Tue, 13 Jun 2017 23:44:45 +0000 (23:44 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev am:
796b510787
am:
85c9638438
Change-Id: Icc9968bcbee5fb029a4fea4368ac57fc7bc6c71d
Android Build Merger (Role) [Tue, 13 Jun 2017 23:44:14 +0000 (23:44 +0000)]
Merge "Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e am:
e9a4951c4d" into oc-dr1-dev-plus-aosp
Adam Lesinski [Tue, 13 Jun 2017 23:43:08 +0000 (23:43 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e
am:
e9a4951c4d
Change-Id: I8093fff1e13490be07b62537bbfdfd064102bb46
Adam Lesinski [Tue, 13 Jun 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am:
9274d87a0e
am:
26cafd3e42
Change-Id: I59bdeb970bd305f7c01a3f2cf405102ae95756ed
Christopher Tate [Tue, 13 Jun 2017 23:39:28 +0000 (23:39 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
am:
796b510787
Change-Id: I0659c68ece4fef6d3e93e436a35c960dc341618b
Brad Ebinger [Tue, 13 Jun 2017 23:37:18 +0000 (23:37 +0000)]
Merge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am:
f69a9c9dc6" into oc-dr1-dev-plus-aosp
am:
3f6af5d5b6
Change-Id: Ic86b7c0fbea0e5de8fbd3c7b8561d54fb2f32940
Winson Chung [Tue, 13 Jun 2017 23:34:53 +0000 (23:34 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8 am:
3609f00c42
am:
fcc2d58b74
Change-Id: I6460764e932157bbfa1346055f889460dc48ce62
Christopher Tate [Tue, 13 Jun 2017 23:34:51 +0000 (23:34 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
am:
796b510787
Change-Id: I8c87bb6ac0ed8867ffd36a6fe1692bfb933bf746
Todd Kennedy [Tue, 13 Jun 2017 23:32:25 +0000 (23:32 +0000)]
Merge "Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6 am:
b692f4a095" into oc-dr1-dev-plus-aosp
am:
839fad6e4c
Change-Id: Ib259f55958ca2bc600cd5fc7ab8e95fd020bfd56
Adam Lesinski [Tue, 13 Jun 2017 23:32:22 +0000 (23:32 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am:
9274d87a0e
Change-Id: I1b62c2f6aeb7d7167a6bbf1e4b09124914c7936e
Adam Lesinski [Tue, 13 Jun 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am:
9274d87a0e
Change-Id: I559890874c83627283a891f7eb6c4fd46430f618
Lucas Dupin [Tue, 13 Jun 2017 23:30:15 +0000 (16:30 -0700)]
Disable StatusBar logs
Reverted DEBUG flag that was accidentally
set to true.
Test: make
Change-Id: Icb37d7831052f4bb1c3a1e2349f5af5270a9e932
TreeHugger Robot [Tue, 13 Jun 2017 23:27:10 +0000 (23:27 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
Todd Kennedy [Tue, 13 Jun 2017 23:22:33 +0000 (16:22 -0700)]
protect mIsolatedPackages access
Change-Id: I125cd382315f88741c59e3c649830d43d72aa596
Fixes:
38341243
Test: manual
TreeHugger Robot [Tue, 13 Jun 2017 23:16:58 +0000 (23:16 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
Todd Kennedy [Tue, 13 Jun 2017 23:16:55 +0000 (23:16 +0000)]
Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6 am:
80b761b6db
am:
7ad9b0bbd4
Change-Id: Iead9bfc153bfffd43d3d0f3cf68f066cedf4931c
Yang Ni [Tue, 13 Jun 2017 23:14:51 +0000 (23:14 +0000)]
Merge "Do not CloseGuard KernelID or FieldID" am:
6b70eafae1 am:
d25acf1022 am:
1b74e324f6
am:
532a67c464
Change-Id: Ie19e224a261c08063c2078b2ad8c4ead238102ab
Katsiaryna Naliuka [Tue, 13 Jun 2017 23:10:34 +0000 (23:10 +0000)]
Merge "Added a category for lockscreen settings." into oc-dr1-dev am:
7cb007c6d3
am:
0dfadbef78
Change-Id: Id4cc01c16938db285749f6c88ea23502ab8a83d9
Dianne Hackborn [Tue, 13 Jun 2017 23:07:48 +0000 (23:07 +0000)]
Merge "Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
69c3a1d45a am:
22bdb8b88a" into oc-dr1-dev-plus-aosp
am:
71f940f652
Change-Id: I65df5c84bbccd4463f024341eb1f7b57d3f50f3f
Dianne Hackborn [Tue, 13 Jun 2017 23:05:13 +0000 (23:05 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
69c3a1d45a am:
1e41816eb0
am:
948caf17d4
Change-Id: Ifbc178292194781e9fa8d8f3d6ee232aa0142e0f
Android Build Merger (Role) [Tue, 13 Jun 2017 23:04:29 +0000 (23:04 +0000)]
Merge "Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8 am:
8b5b0c2bfa" into oc-dr1-dev-plus-aosp
Winson Chung [Tue, 13 Jun 2017 23:03:35 +0000 (23:03 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8
am:
8b5b0c2bfa
Change-Id: If68611d32998af58c6d59825b27e679783a9109c
Android Build Merger (Role) [Tue, 13 Jun 2017 23:03:10 +0000 (23:03 +0000)]
Merge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am:
f69a9c9dc6" into oc-dr1-dev-plus-aosp
Christopher Tate [Tue, 13 Jun 2017 23:02:57 +0000 (23:02 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am:
630a49aa4e am:
2e135c25a4
am:
444293c837
Change-Id: I585e00f1348562e074667fba9051511aad695857
Brad Ebinger [Tue, 13 Jun 2017 23:01:49 +0000 (23:01 +0000)]
Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev
am:
f69a9c9dc6
Change-Id: Ia53392e722399e33720d3a11d7bee5f18661f862
Winson Chung [Tue, 13 Jun 2017 23:00:15 +0000 (23:00 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am:
167f0001b8
am:
3609f00c42
Change-Id: I3d99f5bc6eebeb4cecf9d479b81a287aebabdb7f
Christopher Tate [Tue, 13 Jun 2017 23:00:09 +0000 (23:00 +0000)]
Merge "Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am:
630a49aa4e am:
f03738d877" into oc-dr1-dev-plus-aosp
am:
fa407b1905
Change-Id: I23e715d92ff0f722d5828ccb9c0e96475e3f108e
TreeHugger Robot [Tue, 13 Jun 2017 22:57:52 +0000 (22:57 +0000)]
Merge "Making action MANAGE_UNKNOWN_APP_SOURCES non-optional"
Winson Chung [Tue, 13 Jun 2017 22:55:00 +0000 (22:55 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am:
167f0001b8
Change-Id: Ie180c311af24be6067ebf8cd24c6c1958dfe0c39
Android Build Merger (Role) [Tue, 13 Jun 2017 22:54:31 +0000 (22:54 +0000)]
Merge "Merge "Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6 am:
304f3a74be" into oc-dr1-dev-plus-aosp am:
872cf08a53"
TreeHugger Robot [Tue, 13 Jun 2017 22:54:09 +0000 (22:54 +0000)]
Merge "Disabled test"
Jason Monk [Tue, 13 Jun 2017 22:53:33 +0000 (22:53 +0000)]
Merge "Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6 am:
304f3a74be" into oc-dr1-dev-plus-aosp
am:
872cf08a53
Change-Id: I1804d0ef43f6c22a8c92362b4a6e22bd84bcc70b
Winson Chung [Tue, 13 Jun 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am:
167f0001b8
Change-Id: I4f54c90c54fd81bd399a0198d48ab597feaba217
Brad Ebinger [Tue, 13 Jun 2017 22:51:28 +0000 (22:51 +0000)]
Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 22:50:04 +0000 (22:50 +0000)]
Merge "Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6 am:
b692f4a095" into oc-dr1-dev-plus-aosp
Jason Monk [Tue, 13 Jun 2017 22:48:02 +0000 (22:48 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6 am:
4764f7b5b5
am:
dc8e8d965c
Change-Id: Ibc5ed9fa199e958d83ee10ee20893ea243668fe4
Todd Kennedy [Tue, 13 Jun 2017 22:46:41 +0000 (22:46 +0000)]
Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6
am:
80b761b6db
Change-Id: I0a2f3b0318b75bd08b8dfa1db1658930617333c1
Todd Kennedy [Tue, 13 Jun 2017 22:46:33 +0000 (22:46 +0000)]
Merge "Save overlay paths as user state" into oc-dev am:
508a5bade6
am:
b692f4a095
Change-Id: I7b3a9b1f543391b50aa63c0c98e166bd58fbc37c
Chad Brubaker [Tue, 13 Jun 2017 22:45:52 +0000 (22:45 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f am:
bfd7cc4dbb
am:
f19a167b86
Change-Id: I78278c69642972bcbbd8ba975d67cc1b9dc93217
TreeHugger Robot [Tue, 13 Jun 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 22:43:40 +0000 (22:43 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f am:
6d1b84bc3f
am:
8a691a3b2e
Change-Id: I03a5aa46d4ae74088d4ffe0eee32c239d044b628
Evan Laird [Tue, 13 Jun 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev am:
70cb08326e
am:
f658ef8cdf
Change-Id: Ic61abc439904f1f5e722c4ef8183cd7dcc14ca99
Todd Kennedy [Tue, 13 Jun 2017 22:39:56 +0000 (22:39 +0000)]
Merge "Save overlay paths as user state" into oc-dev
am:
508a5bade6
Change-Id: Icba76fbeef9f4cd2a067fafd65c750f1f95a4ed0
Todd Kennedy [Tue, 13 Jun 2017 22:39:40 +0000 (22:39 +0000)]
Merge "Save overlay paths as user state" into oc-dev
am:
508a5bade6
Change-Id: If46b58323883dcdeef72f0a394f79becca134c23
Andreas Gampe [Tue, 13 Jun 2017 22:39:05 +0000 (22:39 +0000)]
Merge "Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6 am:
807c9ae55f" into oc-dr1-dev-plus-aosp
am:
0567ce0254
Change-Id: I6d5a182fd82a08d1474fe4b570656fa093b72ac1
Andreas Gampe [Tue, 13 Jun 2017 22:34:38 +0000 (22:34 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6 am:
8767655272
am:
cfe2730bd4
Change-Id: I58a1c8e50574abd5bdbbef7fe6936ff17b45bc5f
TreeHugger Robot [Tue, 13 Jun 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Save overlay paths as user state" into oc-dev
Yang Ni [Tue, 13 Jun 2017 22:29:12 +0000 (22:29 +0000)]
Merge "Do not CloseGuard KernelID or FieldID" am:
6b70eafae1 am:
d25acf1022
am:
1b74e324f6
Change-Id: I1220dcc0ee27b8ba5650bf78cf9e8574b16e3486
Robert Greenwalt [Tue, 13 Jun 2017 22:24:14 +0000 (22:24 +0000)]
Merge "Add updateMethod callback" am:
a0974dbc0f am:
7791ac2e28 am:
01712b1aa6
am:
c89ffbf12a
Change-Id: I77fbb003abd8d8aa7c6892dbb72ab6b5cd8798a4
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:23:23 +0000 (22:23 +0000)]
Merge "Added a category for lockscreen settings." into oc-dr1-dev
am:
7cb007c6d3
Change-Id: Ifd60b2b309fe7e251c13844ef5473bad1a73c757
yangbingqian [Tue, 13 Jun 2017 22:21:51 +0000 (22:21 +0000)]
Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782 am:
60246acdbf am:
a76f1cbd1d" into oc-dr1-dev-plus-aosp
am:
3680e34f3a
Change-Id: I7f3c6995dae7a20e523e50e248035f3eeb040fde
Yang Ni [Tue, 13 Jun 2017 22:18:51 +0000 (22:18 +0000)]
Merge "Do not CloseGuard KernelID or FieldID" am:
6b70eafae1
am:
d25acf1022
Change-Id: I900b48f94fdbdd1f502de36e3f121f472ea1daf8
Tyler Gunn [Tue, 13 Jun 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev am:
48962fcc3b
am:
4998896d22
Change-Id: I60ba08e839f5fc4c1a27694b42dbba7ea97318a0
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:15:33 +0000 (22:15 +0000)]
Merge "Added a category for lockscreen settings." into oc-dr1-dev
Pankaj Kanwar [Tue, 13 Jun 2017 22:13:57 +0000 (22:13 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02 am:
717b5bf3e0 am:
8532bc3b59
am:
f13b8a78f6 -s ours
Change-Id: I4e426aaf8a9aead120a77722659f5aef7fa110d8