OSDN Git Service
Bill Yi [Mon, 2 Oct 2017 17:12:04 +0000 (17:12 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours am:
a77aa847f8 -s ours
am:
595adddf1c -s ours
Change-Id: Ia591f2b47dffdeb12b471c4236e2f8e512cb8ffc
Bill Yi [Mon, 2 Oct 2017 17:05:03 +0000 (17:05 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours am:
a8c4c7aa94 -s ours
am:
a77aa847f8 -s ours
Change-Id: Iad25d5ad2bdda26aba5a49bf7a118d86d8eb0b2d
Bill Yi [Mon, 2 Oct 2017 16:54:38 +0000 (16:54 +0000)]
Import translations. DO NOT MERGE am:
45de16dde5 -s ours
am:
a8c4c7aa94 -s ours
Change-Id: I6485896b6b814d124c5a7a7b69e0e0a5910a383b
Bill Yi [Mon, 2 Oct 2017 16:47:00 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE
am:
45de16dde5 -s ours
Change-Id: Idaa0738ef0b990ef955a0f6c55c7a0905739439a
Hugo Benichi [Mon, 2 Oct 2017 10:44:51 +0000 (10:44 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am:
1211941aa0
am:
0d506fc4f4
Change-Id: I630392c4c7dbfd52bf3378f9435cf0cb5b328f6a
Hugo Benichi [Mon, 2 Oct 2017 10:36:22 +0000 (10:36 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
am:
1211941aa0
Change-Id: I169e1d48bffab3326dd61011b7747c1400b9bc74
Treehugger Robot [Mon, 2 Oct 2017 10:24:48 +0000 (10:24 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
Hugo Benichi [Fri, 29 Sep 2017 00:34:08 +0000 (09:34 +0900)]
ConnectivityServiceTest: fix flaky testNetworkRequestMaximum
Registered requests are not keyed by PendingIntents in
ConnectivityService, which means that unregistering a request with a
PendingIntent causes a linear search in all registered requests.
testNetworkRequestMaximum was registering too many PendingIntents
simultaneously, causing the unregistration loop to have n^2
complexity and to take a long time to take effect.
To make the unregistering loop less likely to trigger a timeout on
waitForIdle, this patch changes the test to not register MAX_REQUEST
number of PendingIntent, but instead mixes a small number of
PendingIntents with NetworkCallbacks to reach MAX_REQUEST number of
simultaneously registered requests.
When unregistering these requests, callbacks are unregistered first.
Bug:
32561414
Test: runtest frameworks-net
Change-Id: I48b882c884abe20b388190b7f28baee293446f37
Bill Yi [Mon, 2 Oct 2017 04:27:23 +0000 (21:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ca153d375ff59721c164c9841f7c873aaa562fc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hansong Zhang [Sat, 30 Sep 2017 04:58:48 +0000 (04:58 +0000)]
Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc
am:
849805b804
Change-Id: I17a5fd3eac7366f8e721419cafea6e79c98b50c5
Hansong Zhang [Sat, 30 Sep 2017 04:48:28 +0000 (04:48 +0000)]
Merge "Bluetooth HID Device: Fix a typo"
am:
d30e47ecfc
Change-Id: Ibd3c731781359861d89a7f396ead2f9a7b377821
Hansong Zhang [Sat, 30 Sep 2017 04:35:54 +0000 (04:35 +0000)]
Merge "Bluetooth HID Device: Fix a typo"
Siyamed Sinir [Sat, 30 Sep 2017 03:37:38 +0000 (03:37 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours am:
9b3559aee9
am:
eee38701b5
Change-Id: Ibd90487722439a578841ffde90a2731cf10f57a3
Siyamed Sinir [Sat, 30 Sep 2017 03:26:08 +0000 (03:26 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959 am:
36153a9689 -s ours
am:
9b3559aee9
Change-Id: I85c08a27dc190d7c6710fd2b928d8e018d08ede8
Siyamed Sinir [Sat, 30 Sep 2017 03:19:36 +0000 (03:19 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e am:
7c7945c959
am:
36153a9689 -s ours
Change-Id: I341930f4f2195705ec0ddcef29e807602f93f98b
Siyamed Sinir [Sat, 30 Sep 2017 01:15:21 +0000 (01:15 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137 am:
9865205a4e
am:
7c7945c959
Change-Id: I0d4f109c2e73ee7088bb8b77eba563d60ee0113f
Siyamed Sinir [Sat, 30 Sep 2017 01:07:30 +0000 (01:07 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a am:
d93f91a137
am:
9865205a4e
Change-Id: I7c34d6b58d5aacadd6efa07ce12f9b7e9898768a
Siyamed Sinir [Sat, 30 Sep 2017 00:58:30 +0000 (00:58 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114 am:
17735f183a
am:
d93f91a137
Change-Id: If4bb2848e0df71257a1f7e162524ebd08a5dad4d
Siyamed Sinir [Sat, 30 Sep 2017 00:51:02 +0000 (00:51 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77 am:
85439e9114
am:
17735f183a
Change-Id: I71795f8f2f454956797ffaa78d22ca3573e5d626
Siyamed Sinir [Sat, 30 Sep 2017 00:37:54 +0000 (00:37 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77
am:
85439e9114
Change-Id: Ic616bde55a3a60eec10d9330907e6d8164b76c86
Siyamed Sinir [Sat, 30 Sep 2017 00:28:19 +0000 (00:28 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307
am:
a4f6ca3e77
Change-Id: If3b713963f393b7a16352d03c28dced60e2df7db
Siyamed Sinir [Sat, 30 Sep 2017 00:22:03 +0000 (00:22 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c
am:
095eda9307
Change-Id: I4ff17f12c20f95efe68115cc3d6b7d5e9b47228c
Siyamed Sinir [Sat, 30 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile
am:
6d79675e0c
Change-Id: Icea573859a6d441e18665d9da855370582f2992a
Siyamed Sinir [Fri, 29 Sep 2017 23:40:15 +0000 (23:40 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev am:
8155446b77
am:
8c8e5ce966
Change-Id: I0510692cbbb996b652cd6b0c2967d44c7e7b1fbf
Siyamed Sinir [Fri, 29 Sep 2017 23:28:05 +0000 (23:28 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev
am:
8155446b77
Change-Id: I21712b3913ab073d1e0265bc8eb73d9fa33c032c
Siyamed Sinir [Fri, 29 Sep 2017 23:15:06 +0000 (23:15 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-dev
Hansong Zhang [Wed, 27 Sep 2017 23:59:01 +0000 (16:59 -0700)]
Bluetooth HID Device: Fix a typo
Fixed a typo in BluetoothInputHost. "DIGITIZER_TABLED" should be
"DIGITIZER_TABLET".
Test: Not needed.
Change-Id: I06ffc536f5912d53319b4d325f77991d65ab04f2
Marco Nelissen [Fri, 29 Sep 2017 20:11:56 +0000 (20:11 +0000)]
Merge "AmrInputStream is not a public API" am:
c3b1442d52
am:
fa55320f5d
Change-Id: I44e4bbdb4919fa76bd47a25f4260ee943c9a6ecc
Marco Nelissen [Fri, 29 Sep 2017 20:04:54 +0000 (20:04 +0000)]
Merge "AmrInputStream is not a public API"
am:
c3b1442d52
Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb
Treehugger Robot [Fri, 29 Sep 2017 19:50:37 +0000 (19:50 +0000)]
Merge "AmrInputStream is not a public API"
Marco Nelissen [Fri, 29 Sep 2017 17:15:34 +0000 (10:15 -0700)]
AmrInputStream is not a public API
and nobody should be using it. Add some warnings to that effect.
Change-Id: I8029ccd665fd147b4708a68f61c6aa055004a5c1
Erik Kline [Fri, 29 Sep 2017 11:16:22 +0000 (11:16 +0000)]
Merge "Change BlockingSocketReader to use MessageQueue fd handling" am:
48c7d27f64
am:
b9b0886335
Change-Id: Id543589394c230b657ac150ab8fd4b9e388283eb
Mathieu Chartier [Fri, 29 Sep 2017 08:34:43 +0000 (08:34 +0000)]
Merge "Add frameworks base config and move text blobs there" am:
34cf8b2c04
am:
0dae24ff44
Change-Id: Ie1c4ee3e50e804c41daf95ec8c65aa001ad4ffc0
Yifan Hong [Fri, 29 Sep 2017 08:23:11 +0000 (08:23 +0000)]
Merge "VintfRuntimeInfo: do not fetch files that are not needed" am:
3e3e26305a
am:
3d1214508b
Change-Id: If4b8946c8a2169601a52f950260f3859e0f2ab49
Dan Willemsen [Fri, 29 Sep 2017 04:20:12 +0000 (04:20 +0000)]
Merge "Rename libz-host -> libz" am:
3e47510e0e
am:
7190974801
Change-Id: I3646e56c8cc9c1a6134db38f5740d4698b266218
Erik Kline [Fri, 29 Sep 2017 02:41:34 +0000 (02:41 +0000)]
Merge "Change BlockingSocketReader to use MessageQueue fd handling"
am:
48c7d27f64
Change-Id: Ie2ad48132d68d3682e99a4626472c5780457e4a3
Treehugger Robot [Fri, 29 Sep 2017 02:12:32 +0000 (02:12 +0000)]
Merge "Change BlockingSocketReader to use MessageQueue fd handling"
Mathieu Chartier [Fri, 29 Sep 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Add frameworks base config and move text blobs there"
am:
34cf8b2c04
Change-Id: Id96e4b6a3272f2f320b898c42e4970e4bbb2adb9
Mathieu Chartier [Thu, 28 Sep 2017 23:43:46 +0000 (23:43 +0000)]
Merge "Add frameworks base config and move text blobs there"
Yifan Hong [Thu, 28 Sep 2017 23:41:22 +0000 (23:41 +0000)]
Merge "VintfRuntimeInfo: do not fetch files that are not needed"
am:
3e3e26305a
Change-Id: Idc4bc3285aaeb909db8e46cd30958a5c8acb114f
Dan Willemsen [Thu, 28 Sep 2017 22:56:49 +0000 (22:56 +0000)]
Merge "Rename libz-host -> libz"
am:
3e47510e0e
Change-Id: Iff30621eddc356394617efcc8ced9dc4c9e85e8d
Treehugger Robot [Thu, 28 Sep 2017 22:11:43 +0000 (22:11 +0000)]
Merge "VintfRuntimeInfo: do not fetch files that are not needed"
Mathieu Chartier [Fri, 11 Aug 2017 21:35:46 +0000 (14:35 -0700)]
Add frameworks base config and move text blobs there
Bug:
64259751
Test: clean oat files && make and flash
(cherry picked from commit
a023b86c3b4554b90ed6edfd63cedddb4f0100f9)
Merged-In: I7c898d69e66257fe0a7827ebbab1fcff4aa6473e
Change-Id: Ifb40ec51e7184984853c0d2382f040d2dea63168
Andreas Gampe [Thu, 28 Sep 2017 21:29:54 +0000 (21:29 +0000)]
Merge "Frameworks: Move Log holder to be preloaded" am:
7dd3a7d5c0
am:
5f9ba1a2b6
Change-Id: I06eee3546daac89c36a8f26bd4c51d8f2e972377
Andreas Gampe [Thu, 28 Sep 2017 21:21:33 +0000 (21:21 +0000)]
Merge "Frameworks: Move Log holder to be preloaded"
am:
7dd3a7d5c0
Change-Id: Ief51fd7b8cdf14c22ded48fde7121d6cca8f243e
Dan Willemsen [Thu, 28 Sep 2017 20:57:43 +0000 (20:57 +0000)]
Merge "Rename libz-host -> libz"
Treehugger Robot [Thu, 28 Sep 2017 20:57:35 +0000 (20:57 +0000)]
Merge "Frameworks: Move Log holder to be preloaded"
Bill Yi [Thu, 28 Sep 2017 20:55:17 +0000 (20:55 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours am:
5f76e0c11d -s ours
am:
8271e98237 -s ours
Change-Id: I85207c3c0bc518c71682ebe7a07bd7fe2adbd7da
Bill Yi [Thu, 28 Sep 2017 20:19:13 +0000 (20:19 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours am:
27d4c36a3d -s ours
am:
5f76e0c11d -s ours
Change-Id: I231ba5e0ac321a50cad0de5c496f84665ce8b89e
Bill Yi [Thu, 28 Sep 2017 20:12:05 +0000 (20:12 +0000)]
Import translations. DO NOT MERGE am:
47749a01d7 -s ours
am:
27d4c36a3d -s ours
Change-Id: Ie5b388d1266df622b41aabc29991509e2a0dc94f
Bill Yi [Thu, 28 Sep 2017 20:06:06 +0000 (20:06 +0000)]
Import translations. DO NOT MERGE
am:
47749a01d7 -s ours
Change-Id: I8c9c8f1ef6b35bffc1939fd7313261aa104ffe09
Makoto Onuki [Thu, 28 Sep 2017 16:46:37 +0000 (16:46 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled" am:
36d606c86d
am:
2a99cbb96f
Change-Id: I5f85ecb0b2434836fa1dd4c508d3f24290d19bf3
Makoto Onuki [Thu, 28 Sep 2017 16:36:15 +0000 (16:36 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled"
am:
36d606c86d
Change-Id: Ib0a9eb74f7b31a644472631c10d3a0f1604d8033
Bill Yi [Thu, 28 Sep 2017 16:19:09 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a980312abf -s ours
am:
9f05e68ea5 -s ours
Change-Id: I6de282dbe84110fef47a069ad6cd2dc17e9bea7f
Makoto Onuki [Thu, 28 Sep 2017 16:19:05 +0000 (16:19 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled"
Bill Yi [Thu, 28 Sep 2017 16:10:47 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a980312abf -s ours
Change-Id: I59f002be824830c9ab3224c25c9d9d39edca43f1
TreeHugger Robot [Thu, 28 Sep 2017 15:59:12 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Andreas Gampe [Wed, 27 Sep 2017 18:57:27 +0000 (11:57 -0700)]
Frameworks: Move Log holder to be preloaded
To avoid issues with late initialization, let the holder be
initialized in the zygote.
(cherry picked from commit
61a3e8c23a7c62c389433113802a0d74f4ab53cf)
Bug:
65927416
Test: m
Merged-In: I6f454df46d4c64d295e1f2510793d5087b74fb74
Change-Id: I6f454df46d4c64d295e1f2510793d5087b74fb74
Hugo Benichi [Thu, 28 Sep 2017 12:28:44 +0000 (12:28 +0000)]
Merge "Fix NPE in NsdServiceTest" am:
60d5390f7a
am:
f9422cc65b
Change-Id: I2c88d81081c7994d42eb2715f29233817730201d
Hugo Benichi [Thu, 28 Sep 2017 12:22:34 +0000 (12:22 +0000)]
Merge "Fix NPE in NsdServiceTest"
am:
60d5390f7a
Change-Id: Ic9b7aaec14066d18247cc1efbdc06be1e6a79f29
Hugo Benichi [Thu, 28 Sep 2017 12:13:18 +0000 (12:13 +0000)]
Merge "Fix NPE in NsdServiceTest"
Bill Yi [Thu, 28 Sep 2017 10:46:39 +0000 (03:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I78318e3a6213ef4ec92a409d319d076740914da0
Erik Kline [Mon, 10 Jul 2017 11:17:30 +0000 (20:17 +0900)]
Change BlockingSocketReader to use MessageQueue fd handling
Convert the simplistic blocking read in a separate thread model to
the MessageQueue OnFileDescriptorEventListener model, albeit still
on a separate thread.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- basic IpManager functions still work,
including ConnectivityPacketTracker
Bug:
62476366
Bug:
67013397
Change-Id: I1f4a6707eba402338947fe3f5392a26660f05714
Jean Chalard [Thu, 28 Sep 2017 07:52:54 +0000 (07:52 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission" am:
6201cc6f27
am:
758d1e1ef7
Change-Id: Ic620c2d3be6c7c5dd815961a36e5296a761e7d73
Jean Chalard [Thu, 28 Sep 2017 07:47:30 +0000 (07:47 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission"
am:
6201cc6f27
Change-Id: Ie2ed67525e719104cef1537568f944b77d5f5e4e
Jean Chalard [Thu, 28 Sep 2017 07:39:14 +0000 (07:39 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission"
Chalard Jean [Tue, 26 Sep 2017 06:45:18 +0000 (15:45 +0900)]
Do not throw on call to isTetheringSupported w/o permission
...just return false instead.
Test: Made an app to test this. Made sure it doesn't have
Test: the required permission. Checked it crashes with
Test: SecurityException without this change. Checked that it
Test: doesn't with it.
Merged-In: Ib5b17a7f68c1327f47fe1f54c0454c51f4226907
Change-Id: Id20d3c240ec5d70d085e0366b92ab3a514f3e7c8
(cherry picked from commit
8f76fc38ec1682667de2caf3940fbfb71744d368)
Hugo Benichi [Tue, 26 Sep 2017 05:51:11 +0000 (14:51 +0900)]
Fix NPE in NsdServiceTest
Continuous test dashboards report that quit() can crash sometimes
due to mThread being null.
This patch adds a null guard in tearDown().
Bug:
32561414
Test: runtest frameworks-net
Change-Id: If66fb47e31e77d25b4741a786f12eb78f0b9102e
Bill Yi [Thu, 28 Sep 2017 05:05:41 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief8d48c64b95c4b11f3015bd311d8a569af54a17
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jeff Sharkey [Thu, 28 Sep 2017 00:23:50 +0000 (00:23 +0000)]
Merge "Only construct real Throwable objects." into oc-dev am:
0868533760
am:
f0278f30da
Change-Id: Id23ee02fb7cfd4b4ab9782066a085ee000fb8a70
Jeff Sharkey [Thu, 28 Sep 2017 00:15:18 +0000 (00:15 +0000)]
Merge "Only construct real Throwable objects." into oc-dev
am:
0868533760
Change-Id: I260dc1d1c903f1c1c2828d68049f9f202daa0869
TreeHugger Robot [Thu, 28 Sep 2017 00:05:42 +0000 (00:05 +0000)]
Merge "Only construct real Throwable objects." into oc-dev
Dan Willemsen [Wed, 27 Sep 2017 23:20:31 +0000 (16:20 -0700)]
Rename libz-host -> libz
Test: m host
Change-Id: I2806dde519602bc31b622ae3b3f55ab8b1287744
Yifan Hong [Tue, 26 Sep 2017 22:07:34 +0000 (15:07 -0700)]
VintfRuntimeInfo: do not fetch files that are not needed
... to avoid unnecessary denials.
Test: CtsDeviceInfo
Bug:
66960848
Change-Id: I28821c44285a7de424a79b8a374feac6718605b1
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
f4ec2ab706
am:
c037004fd9
Change-Id: I06831c086920b93f0c1c076e255ce404769b8691
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:04:32 +0000 (20:04 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
am:
f4ec2ab706
Change-Id: I9a0b06f44d2fe7be343fc38ce240d82f1b309d7d
Treehugger Robot [Wed, 27 Sep 2017 19:43:17 +0000 (19:43 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
Lorenzo Colitti [Wed, 27 Sep 2017 10:59:13 +0000 (10:59 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload." am:
d1ae268081
am:
53eb9d359a
Change-Id: If4b3dcf4c1bf03a1d105ad4dfdd007fa371f4472
Lorenzo Colitti [Wed, 27 Sep 2017 10:53:05 +0000 (10:53 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload."
am:
d1ae268081
Change-Id: I060bd7632b809d89224d250c697ac9d2e89d5c2d
Lorenzo Colitti [Wed, 27 Sep 2017 10:46:36 +0000 (10:46 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload."
Jean Chalard [Wed, 27 Sep 2017 10:06:52 +0000 (10:06 +0000)]
Merge "Adds necessary permissions to system apis" am:
b4a5933a62
am:
f3b169c8e6
Change-Id: If10e10963cedfe4b19e57d3b26a6c4113985757f
Jean Chalard [Wed, 27 Sep 2017 09:58:51 +0000 (09:58 +0000)]
Merge "Adds necessary permissions to system apis"
am:
b4a5933a62
Change-Id: Ifa5d94cdd883c3e1b983c985c0c17fe61e864352
Jean Chalard [Wed, 27 Sep 2017 09:50:42 +0000 (09:50 +0000)]
Merge "Adds necessary permissions to system apis"
Lorenzo Colitti [Wed, 27 Sep 2017 08:40:53 +0000 (08:40 +0000)]
Merge "Declare support for Ethernet if the service is running." am:
0d3d35b30b
am:
5ada8e56f8
Change-Id: I8cbd09623b419f14a52f722740580c6ae6de7613
Lorenzo Colitti [Wed, 27 Sep 2017 08:32:43 +0000 (08:32 +0000)]
Merge "Declare support for Ethernet if the service is running."
am:
0d3d35b30b
Change-Id: Ie0a0190da53571c6f4b466840b7878eb54b5e136
Treehugger Robot [Wed, 27 Sep 2017 08:23:34 +0000 (08:23 +0000)]
Merge "Declare support for Ethernet if the service is running."
Lorenzo Colitti [Wed, 27 Sep 2017 04:17:47 +0000 (13:17 +0900)]
Delete the legacy framework code for manipulating ND offload.
This only worked on broadcom devices, and was superseded in
M by a wifi HAL call made by IpManager.
Test: bullhead builds, boots
Change-Id: I711cae7dafe171c2c8b4e84a229adbcad27f3d14
Lorenzo Colitti [Thu, 24 Aug 2017 13:35:10 +0000 (22:35 +0900)]
Declare support for Ethernet if the service is running.
On some devices, support for TYPE_ETHERNET is not specified in
the networkAttributes config resource, even though the device is
capable of supporting Ethernet (e.g., via USB host adapters).
This leads to Ethernet working but various connectivity APIs
behaving as if it was not - for example, no CONNECTIVITY_ACTION
broadcasts will be issues when it connects or disconnects.
Ensure that ConnectivityService always treats Ethernet as
available if the service is running. Currently the service is
started if the device supports FEATURE_ETHERNET or
FEATURE_USB_HOST.
Bug:
37359230
Test: bullhead builds, boots
Test: ConnectivityServiceTest passes
Test: Ethernet is available even if removed from networkAttributes resource
Test: ConnectivityManagerTest CTS test passes
Change-Id: I58801bf4f0bbdc3ff6345ec6bfdc911ce045c8ab
Udam Saini [Wed, 7 Jun 2017 19:06:28 +0000 (12:06 -0700)]
Adds necessary permissions to system apis
adds privileged permission for getCaptivePortalServerUrl
adds tether privileged permission for
startTethering,isTetheringSupported
bug:
62348162
Test: make and manual testing
Change-Id: I8eb8e3c9dcd7201abe9ea303ee57fe99073d67eb
Fyodor Kupolov [Wed, 27 Sep 2017 00:46:29 +0000 (00:46 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am:
bff14ae56f -s ours
am:
602aa57cb9 -s ours
Change-Id: I62c9c5e8edec52feb8bbd680a2206feda172e133
Fyodor Kupolov [Wed, 27 Sep 2017 00:34:37 +0000 (00:34 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak"
am:
bff14ae56f -s ours
Change-Id: I4737fa1dd54600f276ce90d3a04dbbd7cebe7f54
Fyodor Kupolov [Wed, 27 Sep 2017 00:25:16 +0000 (00:25 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak"
nharold [Tue, 26 Sep 2017 22:24:02 +0000 (22:24 +0000)]
Merge changes from topic "re-enable-ipsec" am:
680525c742
am:
8d306cd78a
Change-Id: I4e712a0d17618ca93cf6032b59ce8be0c8e0bfee
Nathan Harold [Tue, 26 Sep 2017 22:22:42 +0000 (22:22 +0000)]
Re-Enable Starting of the IpSecService am:
b72821747c
am:
f434a6d308
Change-Id: I328841b57df6f216c0e4b0aa0c1df923c606a885
tiansiming [Wed, 20 Sep 2017 05:59:13 +0000 (13:59 +0800)]
[DO NOT MERGE] Fix another AddAccountSettings memory leak
The memory leak will always occur in AddAccoutSettings
when Bundle with an invalid intent returned in the addAccount we implement.
Bug:https://issuetracker.google.com/issues/
66088681
Test:Install the app through the github offered in above link,
then press the "Test" item in ChooseAccountActivity (adb shell am start -n
'com.android.settings/.accounts.ChooseAccountActivity') serveal times.
Check the activity number by "adb shell dumpsys meminfo com.android.settings".
Change-Id: Id15fc73521d0ddc6ca891b6029ad04cd4427dbfe
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
nharold [Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)]
Merge changes from topic "re-enable-ipsec"
am:
680525c742
Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
Nathan Harold [Tue, 26 Sep 2017 22:11:58 +0000 (22:11 +0000)]
Re-Enable Starting of the IpSecService
am:
b72821747c
Change-Id: I1f64aa2fdf1cce6dea91427eda65c4b8ee6f6b02
nharold [Tue, 26 Sep 2017 21:46:39 +0000 (21:46 +0000)]
Merge changes from topic "re-enable-ipsec"
* changes:
Re-Expose IpSecService API Surface
Re-Enable Starting of the IpSecService
Makoto Onuki [Wed, 30 Aug 2017 21:53:16 +0000 (14:53 -0700)]
Don't cancel by UID when an app is disabled or uninstalled
Instead, cancel by UID/package.
Bug:
64536115
Test: DO NOT MERGE
Change-Id: Ib1c973e19dbbea1a537de91a96e6a21c787faeaf
Merged-in: I8f50c459cf321ac43fd2a6696cb8d4c593accd67
Bill Yi [Tue, 26 Sep 2017 19:04:06 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours
am:
46181531ec -s ours
Change-Id: Ic283086745e42fe4351c3817782e46ac9c93f1dd
OSDN Git Service
