Paul Duffin
7a1f1d8a85
Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 am: ab62fd67d8 am: 56a2ae1056
...
am: 43267b4b9e
2017-01-19 11:54:00 +00:00
Paul Duffin
43267b4b9e
Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 am: ab62fd67d8
...
am: 56a2ae1056
2017-01-19 11:49:28 +00:00
Paul Duffin
56a2ae1056
Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588
...
am: ab62fd67d8
2017-01-19 11:44:56 +00:00
Paul Duffin
ab62fd67d8
Merge "Prepare for removal of legacy-test from default targets"
...
am: c74ccf1588
2017-01-19 11:40:22 +00:00
Treehugger Robot
c74ccf1588
Merge "Prepare for removal of legacy-test from default targets"
2017-01-19 11:32:11 +00:00
Erik Kline
c2d3ff5553
Merge "Try to deduplicate observer iteration code" am: c8223d0874 am: c822d054a3 am: f8afe45d89
...
am: e344c6732b
2017-01-19 11:31:56 +00:00
Erik Kline
e344c6732b
Merge "Try to deduplicate observer iteration code" am: c8223d0874 am: c822d054a3
...
am: f8afe45d89
2017-01-19 11:27:20 +00:00
Erik Kline
f8afe45d89
Merge "Try to deduplicate observer iteration code" am: c8223d0874
...
am: c822d054a3
2017-01-19 11:22:55 +00:00
Erik Kline
c822d054a3
Merge "Try to deduplicate observer iteration code"
...
am: c8223d0874
2017-01-19 11:18:47 +00:00
Treehugger Robot
c8223d0874
Merge "Try to deduplicate observer iteration code"
2017-01-19 11:10:21 +00:00
Pavel Grafov
b271f34625
Merge "Store pending OTA state and make it accessible via polling api."
2017-01-19 11:09:32 +00:00
Ben Murdoch
769fb4ebcc
Merge "When dragging text, take style data too."
2017-01-19 10:42:12 +00:00
Erik Kline
0654cdeee6
Merge "Eschew unspecified IP addresses for DNS servers" am: 0ac7232b7c am: 9b986734e4 am: d484df91bf
...
am: 91e97fe703
2017-01-19 09:58:52 +00:00
Erik Kline
91e97fe703
Merge "Eschew unspecified IP addresses for DNS servers" am: 0ac7232b7c am: 9b986734e4
...
am: d484df91bf
2017-01-19 09:54:21 +00:00
Erik Kline
d484df91bf
Merge "Eschew unspecified IP addresses for DNS servers" am: 0ac7232b7c
...
am: 9b986734e4
2017-01-19 09:49:43 +00:00
Erik Kline
9b986734e4
Merge "Eschew unspecified IP addresses for DNS servers"
...
am: 0ac7232b7c
2017-01-19 09:46:09 +00:00
Paul Duffin
ccb0445027
Prepare for removal of legacy-test from default targets
...
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)
Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
2017-01-19 09:43:05 +00:00
Treehugger Robot
0ac7232b7c
Merge "Eschew unspecified IP addresses for DNS servers"
2017-01-19 09:38:27 +00:00
Paul Duffin
648abd31e8
Merge "Prepare for removal of legacy-test from default targets"
2017-01-19 09:34:19 +00:00
Erik Kline
b2cfdfbbb0
Try to deduplicate observer iteration code
...
Later on, registerObserver() can take a handler argument and
invokeForAllObservers() can be updated to post to it when
provided.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug: 32163131
Change-Id: Ibc32079e1084e2e43f7826fe6b2bdbb83c482e26
2017-01-19 18:05:27 +09:00
fionaxu
3e713e090c
Initial change on carrier signal filtering
...
- add new carrier config
- configure defaultcarrierapp as the default receiver for redirection
signal
Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony
Change-Id: I094c39fe21e6883d2acef8f7479b948fc77ce14e
Merged-In: CHANGE-ID I14bb1a885d1eaca9a144eb1e1caca72339d67d2e
2017-01-19 00:36:16 -08:00
fionaxu
41ca937397
Initial change on carrier signal filtering
...
- add new carrier config
- configure defaultcarrierapp as the default receiver for redirection
signal
Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony
Change-Id: I14bb1a885d1eaca9a144eb1e1caca72339d67d2e
2017-01-19 00:35:24 -08:00
Erik Kline
b5fe748c69
Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev am: 18f1a35d46
...
am: 88d7f34aa6
2017-01-19 08:08:08 +00:00
Erik Kline
5de1615266
Eschew unspecified IP addresses for DNS servers am: a19f9f281a
...
am: b2331e9c34
2017-01-19 08:07:13 +00:00
Erik Kline
88d7f34aa6
Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev
...
am: 18f1a35d46
2017-01-19 08:02:17 +00:00
Erik Kline
b2331e9c34
Eschew unspecified IP addresses for DNS servers
...
am: a19f9f281a
2017-01-19 08:02:11 +00:00
Erik Kline
fed4194af0
Eschew unspecified IP addresses for DNS servers
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-wifi passes (though no test covers this code yet)
Bug: 34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
2017-01-19 17:01:46 +09:00
TreeHugger Robot
18f1a35d46
Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev
2017-01-19 07:57:15 +00:00
Mark Rathjen
ea617597c7
Fix NPE in SettingsProvider.
...
Bug: 34387347, 34396959, 34395671
Test: CTS tests passed, Manual testing passed
Change-Id: I333dfba05f9a4706af22b850b8a010cf391350fc
2017-01-18 23:03:41 -08:00
yuanhao
47f9f7cbcb
Fixed NPE in canAddMoreManagedProfiles
...
We can use the command 'adb shell pm create-user --profileOf -10000
--managed TestProfile_12345678' to reproduce the problem.
Signed-off-by: yuanhao <yuanhao@xiaomi.com >
2017-01-19 06:56:22 +00:00
TreeHugger Robot
d66ae533a9
Merge "Use public version of AppFuse in MtpDocumentsProvider."
2017-01-19 06:54:06 +00:00
Lorenzo Colitti
aba7c9affa
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev am: bb08c408a8
...
am: 8580fda424
2017-01-19 06:38:29 +00:00
Hisanobu Watanabe
55209a6284
VPN reconnection fails after manually disabling VPN am: 2b465d889c
...
am: e4a8c10029
2017-01-19 06:37:32 +00:00
Lorenzo Colitti
8580fda424
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev
...
am: bb08c408a8
2017-01-19 06:33:07 +00:00
Hisanobu Watanabe
e4a8c10029
VPN reconnection fails after manually disabling VPN
...
am: 2b465d889c
2017-01-19 06:33:00 +00:00
Lorenzo Colitti
bb08c408a8
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev
2017-01-19 06:27:24 +00:00
Erik Kline
a19f9f281a
Eschew unspecified IP addresses for DNS servers
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-wifi passes (though no test covers this code yet)
Bug: 34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
2017-01-19 15:27:08 +09:00
TreeHugger Robot
e6010d2b2a
Merge "create a metrics log reader for tests"
2017-01-19 06:22:30 +00:00
TreeHugger Robot
aba241892e
Merge "Notify task about display change when moved to new stack"
2017-01-19 05:42:12 +00:00
Tomasz Mikolajewski
03e59f6e3f
Merge "Add Web Links API to framework."
2017-01-19 05:26:11 +00:00
Daichi Hirono
e80ea38489
Use public version of AppFuse in MtpDocumentsProvider.
...
AppFuse is now a public API. The CL removes the private version from
MtpDocuemntsProvider package and switches to the public version.
Bug: 32891253
Test: MtpDocumentsProviderTest
Change-Id: Ibdf67309bc0678e2f70ac2dddb920125d9e0760e
2017-01-19 14:14:00 +09:00
TreeHugger Robot
11ec801a9f
Merge "consumerir HAL uses "default" service name"
2017-01-19 05:02:13 +00:00
Bill Yi
af48d66e16
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7c0a5220cb -s ours
...
am: aad64fe869
2017-01-19 04:57:09 +00:00
Bill Yi
c83e1540b5
Import translations. DO NOT MERGE am: c2eddc99cd -s ours
...
am: 15f7c3fdf8
2017-01-19 04:56:16 +00:00
Bill Yi
87a1ddb05d
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9ba372781e -s ours
...
am: 46db3c47d1
2017-01-19 04:55:19 +00:00
Bill Yi
d007ea58ea
Import translations. DO NOT MERGE am: 61385acb7a -s ours
...
am: e85770348a
2017-01-19 04:54:23 +00:00
Bill Yi
aad64fe869
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 7c0a5220cb
2017-01-19 04:49:54 +00:00
Bill Yi
15f7c3fdf8
Import translations. DO NOT MERGE
...
am: c2eddc99cd
2017-01-19 04:49:49 +00:00
Bill Yi
46db3c47d1
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 9ba372781e
2017-01-19 04:48:27 +00:00
Bill Yi
e85770348a
Import translations. DO NOT MERGE
...
am: 61385acb7a
2017-01-19 04:48:22 +00:00
