OSDN Git Service
Brad Ebinger [Wed, 24 May 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Support RRO for emergency number conversion map" am:
671680e504
am:
8498a6cffd
Change-Id: I4b90f44a5ccf42ab1586ae8867f63c0a2e362d97
Brad Ebinger [Wed, 24 May 2017 20:27:48 +0000 (20:27 +0000)]
Merge "Support RRO for emergency number conversion map"
am:
671680e504
Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82
Brad Ebinger [Wed, 24 May 2017 20:19:29 +0000 (20:19 +0000)]
Merge "Support RRO for emergency number conversion map"
zhoulei [Wed, 24 May 2017 14:43:04 +0000 (14:43 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse" am:
8516a2025a
am:
19be2ee686
Change-Id: Ie32bf7de581e0a4ec1cdfe36417c9f8fb512932c
zhoulei [Wed, 24 May 2017 14:37:32 +0000 (14:37 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse"
am:
8516a2025a
Change-Id: I1a2bb68ba34c48261d1c990445b0735d2449e21e
Treehugger Robot [Wed, 24 May 2017 14:28:48 +0000 (14:28 +0000)]
Merge "[NotificationManagerService]Support multi users to notification pulse"
Paul Duffin [Wed, 24 May 2017 08:19:09 +0000 (08:19 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a
am:
c1f0962ea7
Change-Id: I562bec1735557ed6718da4004fdd54e822f1e7f3
Paul Duffin [Wed, 24 May 2017 08:11:37 +0000 (08:11 +0000)]
Merge "Fixed nfc-extras build files"
am:
d3ff45985a
Change-Id: I4786af397c556c72d1f7ac9ff7d762fa3efcf90b
Paul Duffin [Wed, 24 May 2017 08:01:36 +0000 (08:01 +0000)]
Merge "Fixed nfc-extras build files"
Hugo Benichi [Wed, 24 May 2017 07:07:11 +0000 (07:07 +0000)]
Merge "Move NsdServiceTest to correct directory" am:
0a76f99621
am:
ca9fcb79f6
Change-Id: Ia3f79fbcead21fdf4914b18905cd3b067ac7c806
Hugo Benichi [Wed, 24 May 2017 06:59:02 +0000 (06:59 +0000)]
Merge "Move NsdServiceTest to correct directory"
am:
0a76f99621
Change-Id: I37b614bec6dc4a9da55024c534dbfc9459e2764a
Treehugger Robot [Wed, 24 May 2017 06:47:29 +0000 (06:47 +0000)]
Merge "Move NsdServiceTest to correct directory"
Hugo Benichi [Wed, 24 May 2017 05:16:55 +0000 (14:16 +0900)]
Move NsdServiceTest to correct directory
Test: no functional change
Bug:
62044295
Change-Id: Iad3af646e8d252f84978d1a367878a78c2869982
Jayachandran C [Wed, 24 May 2017 02:09:09 +0000 (02:09 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" am:
485d103083
am:
0223c80846
Change-Id: I0fbddd65da2698eb8aa5291e3ed8e19af2924b1f
Jayachandran C [Wed, 24 May 2017 02:01:12 +0000 (02:01 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED"
am:
485d103083
Change-Id: I8e7c513b206cbc5f19d582ec48e529ce067e2aa9
Treehugger Robot [Wed, 24 May 2017 01:51:04 +0000 (01:51 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED"
Erik Wolsheimer [Tue, 23 May 2017 22:58:57 +0000 (22:58 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805
am:
94b497bccc
Change-Id: I14f0b27d9d068df1defed18cd148ee331e0e876a
Erik Wolsheimer [Tue, 23 May 2017 22:51:25 +0000 (22:51 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
am:
90a6054805
Change-Id: I708fda61e866a891238d6dbbfc6a9b901e6da6b3
TreeHugger Robot [Tue, 23 May 2017 22:44:37 +0000 (22:44 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
Jayachandran C [Thu, 18 May 2017 06:53:59 +0000 (23:53 -0700)]
Fix up upstream interface types for case DUN_UNSPECIFIED
The existing logic will add TYPE_MOBILE and TYPE_MOBILE_HIPRI
even if the carrier config has TYPE_DUN for DUN_UNSPECIFIED.
A check is added not to modify the upstream interface types
if there is already a cellular interface type. Add TYPE_MOBILE
and TYPE_MOBILE_HIPRI if there is no cellular types found.
Test: Hotspot on Verizon and T-Mobile US.
Verified the requestNetwork has the DUN capability.
Bug:
38186915
Change-Id: I74fc5c791fee2885bf66df8975e92c2b48f1668c
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:50:12 +0000 (20:50 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" am:
65d3a457d2
am:
96926cac25
Change-Id: I663415938196335bd27d9172b59d5f169a0609e3
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:43:10 +0000 (20:43 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance"
am:
65d3a457d2
Change-Id: I3b7bfb3963b61c4589811e8c27e4f89ff501096e
Treehugger Robot [Tue, 23 May 2017 20:34:54 +0000 (20:34 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance"
Dan Willemsen [Tue, 23 May 2017 17:18:55 +0000 (17:18 +0000)]
Merge "Fix makefile warning." am:
f523227a6e
am:
9e317f8743
Change-Id: I8078c4dfbb3cbc55dd6d08888c67c31721a77397
Dan Willemsen [Tue, 23 May 2017 17:12:03 +0000 (17:12 +0000)]
Merge "Fix makefile warning."
am:
f523227a6e
Change-Id: I852b00eb0c562003307507d02e1dd80a7d42cf9f
Dan Willemsen [Tue, 23 May 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Fix makefile warning."
Hugo Benichi [Tue, 23 May 2017 11:44:33 +0000 (11:44 +0000)]
Merge "Fix NetworkStatsObserversTest" am:
0dc35fa969
am:
25282c3e38
Change-Id: I8cc0dc340d3108d74cea96487560bbc8cfa2f650
Hugo Benichi [Tue, 23 May 2017 11:37:37 +0000 (11:37 +0000)]
Merge "Fix NetworkStatsObserversTest"
am:
0dc35fa969
Change-Id: I9b4e83b4e437089ea500d82990e59558ff55e02a
Hugo Benichi [Tue, 23 May 2017 11:29:47 +0000 (11:29 +0000)]
Merge "Fix NetworkStatsObserversTest"
Paul Duffin [Mon, 22 May 2017 14:58:56 +0000 (15:58 +0100)]
Fixed nfc-extras build files
The com.android.nfc_extras target was including the test class.
The nfc-extras/tests/Android.mk file was not being included so
was not being built by continuous build and could not be built
using make NfcExtrasTests.
Bug:
38487370
Bug:
30188076
Test: make checkbuild
Change-Id: I17f6723b899f26de329a2e74177bd02ba864b7b2
Andrew Scull [Tue, 23 May 2017 10:47:09 +0000 (10:47 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings" am:
44b7e94a7c
am:
0ba1fa19bd
Change-Id: Ia89fdb05890d40b1299c666a4535b4e9a8640323
Andrew Scull [Tue, 23 May 2017 10:40:38 +0000 (10:40 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
am:
44b7e94a7c
Change-Id: I7cade535f2bca308446aa91d4368ee41b62daa9b
Treehugger Robot [Tue, 23 May 2017 10:31:57 +0000 (10:31 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
Hugo Benichi [Tue, 23 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Fix NetworkStatsAccessTest" am:
ec1f25a4ba
am:
cdb75d321b
Change-Id: I5ef9861438bbe474b4e4670b8fdba4368531978d
Hugo Benichi [Tue, 23 May 2017 06:51:15 +0000 (06:51 +0000)]
Merge "Fix NetworkStatsAccessTest"
am:
ec1f25a4ba
Change-Id: If949493d9967fa723667947979262bf4f90841c2
Hugo Benichi [Tue, 23 May 2017 06:43:06 +0000 (06:43 +0000)]
Merge "Fix NetworkStatsAccessTest"
Hugo Benichi [Tue, 23 May 2017 06:30:48 +0000 (06:30 +0000)]
Merge "ConnectivityManager: simplify callback handler" am:
857e7d9c85
am:
7bce658dd6
Change-Id: Ica9d4fbb1dd0ba9da4aaea0fbc3571c3446110ef
Hugo Benichi [Tue, 23 May 2017 06:24:16 +0000 (06:24 +0000)]
Merge "ConnectivityManager: simplify callback handler"
am:
857e7d9c85
Change-Id: I8d5371b69fcec3f1f625923eb65191b4c018bb00
Treehugger Robot [Tue, 23 May 2017 06:16:47 +0000 (06:16 +0000)]
Merge "ConnectivityManager: simplify callback handler"
Tomasz Wasilczyk [Tue, 11 Apr 2017 18:06:34 +0000 (11:06 -0700)]
Fix makefile warning.
Test: it builds.
Bug: b/
37159108
Change-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Merged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Erik Kline [Tue, 23 May 2017 05:03:05 +0000 (05:03 +0000)]
Merge "Refactor TISM add/remove code" am:
5041bbde19
am:
c85053f7eb
Change-Id: Id001b164a7eca7b4e681eefbadf4b87bb1f7dbd1
Erik Kline [Tue, 23 May 2017 04:56:40 +0000 (04:56 +0000)]
Merge "Refactor TISM add/remove code"
am:
5041bbde19
Change-Id: I2475a3cbff37248509e21dd058ed8f3d827fefd0
Hugo Benichi [Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am:
a82cac1452
am:
004f36d5bc
Change-Id: Id8468bd8e38927341cdbebe2925c0bfd4bb37c0c
Treehugger Robot [Tue, 23 May 2017 04:44:22 +0000 (04:44 +0000)]
Merge "Refactor TISM add/remove code"
Hugo Benichi [Tue, 23 May 2017 04:42:40 +0000 (04:42 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
am:
a82cac1452
Change-Id: I241192b2d9565c41f47bbe6227b50049898da679
Hugo Benichi [Tue, 23 May 2017 04:35:08 +0000 (04:35 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
Android Build Merger (Role) [Tue, 23 May 2017 03:34:41 +0000 (03:34 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74" into nyc-mr2-dev-plus-aosp
Hugo Benichi [Tue, 23 May 2017 03:34:02 +0000 (03:34 +0000)]
Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f
am:
0187514f74
Change-Id: Ida4b1412270b54f6abe5aa75b7f83d2ffaca0669
Hugo Benichi [Tue, 23 May 2017 03:26:32 +0000 (03:26 +0000)]
Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f
am:
0187514f74
Change-Id: I7ffbc1799d9da901fb38db469720479760892bba
Hugo Benichi [Tue, 23 May 2017 03:20:33 +0000 (03:20 +0000)]
Merge "ConnectivityManager: improve argument validation"
am:
cdfd3a186f
Change-Id: I3adb40fe1bd1779d745bb122da06e33068ce48a3
Treehugger Robot [Tue, 23 May 2017 03:14:29 +0000 (03:14 +0000)]
Merge "ConnectivityManager: improve argument validation"
Hugo Benichi [Tue, 9 May 2017 05:36:02 +0000 (14:36 +0900)]
ConnectivityManager: simplify callback handler
Bug:
36701874
Test: $ runtest frameworks-net
Change-Id: I4d5f08903a54f8dced7cb6ae86703847b908b784
Hugo Benichi [Tue, 9 May 2017 06:19:01 +0000 (15:19 +0900)]
ConnectivityManager: improve argument validation
Using Preconditions and dedicated static methods for checking arguments
to improve error stack traces without error messages.
Test: covered by previously added unit test
Bug:
36701874
Change-Id: Id872b2c887a4bca43a8c3644622add1c2ee57c6d
Hugo Benichi [Mon, 22 May 2017 06:09:25 +0000 (15:09 +0900)]
Fix NetworkStatsObserversTest
This patch fixes several spurious unit tests in
NetworkStatsObserversTest by using the updated waitForIdleHandler of
ConnectivityServiceTest. More specifically this fixes the following
tests:
- testUnregister_knownRequest_releasesCaller
- testUpdateStats_deviceAccess_notifies
- testUpdateStats_userAccess_usageSameUser_notifies
- testUpdateStats_defaultAccess_notifiesSameUid
This patch also removes the dummy message with type -1 sent at the end
of tests in NetworkStatsObserversTest and the associated assert, because
nothing is exercised or asserted immediately after.
This patch also updates NetworkStatsObserversTest to not depend on the
deprecated junit.framework.TestCase.
Bug:
32561414
Test: runtest -x frameworks/base/tests/../NetworkStatsObserversTest.java
Change-Id: I4fc909ee9bacc964c859fa7a3db34f9dc86b89cf
Hugo Benichi [Mon, 22 May 2017 05:33:05 +0000 (14:33 +0900)]
Fix NetworkStatsAccessTest
This patch fixes NetworkStatsAccessTest by taking into account
DEVICESUMMARY which was added in commit
3a8b343ce5220086c4f71e63f5d42f2d28434c4b.
Doing $ git revert
3a8b343ce5220086c4f71e63f5d42f2d28434c4b shows that
the existing assertions of NetworkStatsAccessTest passed before that
commit.
This patch also changes NetworkStatsAccessTest to use up-to-date testing
style and not depend on the deprecated junit.framework.TestCase.
Bug:
32561414
Test: runtest -x frameworks/base/../NetworkStatsAccessTest.java
Change-Id: Ib78f137578cf35e1c766b377b7f812a09173c49e
Hugo Benichi [Mon, 22 May 2017 01:44:02 +0000 (10:44 +0900)]
ConnectivityServiceTest: fix flakyness
This patch attempts to fix the remaining spurious failures in
ConnectivityServiceTest, which have two causes:
- waitForIdle() does not take into account the NetworkAgents handlers.
- the deadlines in testRequestBenchmark are sometimes exceeded.
To fix the first issue, waitForIdle() is moved to a test level instance
method and also calls waitForIdleHandler on any non null
MockNetworkAgent. This is expected to fix spurious errors for the
following tests:
- testMobildeDataAlwaysOn
- testLingering
- testPacketKeepAlive
- testMMSonWiFi
To fix the second issue, the deadlines for testRequestBenchmark are
extended by 10ms. Also, the failure message is made more actionable by
providing the total time it took for the operation, instead of printing
the number of dispatches that were achieved before the deadline.
Bug:
32561414
Test: tests pass many times in a row (~500).
Change-Id: Id33c6ac1edfb0b89634fa7789dccb2da237e2709
Jack Yu [Tue, 23 May 2017 01:16:30 +0000 (01:16 +0000)]
Merge "Added IWLAN metered APN support" am:
70fe11fc38
am:
ab48527680
Change-Id: Ib88c94860f6ef6c61531c9547c0ab993f8bdde37
Jack Yu [Tue, 23 May 2017 01:10:29 +0000 (01:10 +0000)]
Merge "Added IWLAN metered APN support"
am:
70fe11fc38
Change-Id: I12573353fca921d1454d6829302a379cd6b2cc8b
Treehugger Robot [Tue, 23 May 2017 01:02:31 +0000 (01:02 +0000)]
Merge "Added IWLAN metered APN support"
Nick Kralevich [Tue, 23 May 2017 00:47:08 +0000 (00:47 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413 am:
7a06357519 am:
a07389b446 am:
5f4382e2a6 am:
3946a75cb3 am:
3c529012d3
am:
ce8a0dea71
Change-Id: I7f963478355bf0019520c6d9242a6670398698f0
Nick Kralevich [Tue, 23 May 2017 00:46:08 +0000 (00:46 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31 am:
5bfe82c3ee am:
12c5f0da9f am:
dc87ac995a am:
02f0044d98 am:
6cadbad153
am:
fdf1fdfc1b
Change-Id: I76b74d2ec3f72bfc6b3ec6247beb40589112fdfd
Nick Kralevich [Tue, 23 May 2017 00:39:49 +0000 (00:39 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413 am:
7a06357519 am:
a07389b446 am:
5f4382e2a6 am:
3946a75cb3
am:
3c529012d3
Change-Id: I9b3ea4577928b601f81525390fa6dae525275323
Nick Kralevich [Tue, 23 May 2017 00:38:33 +0000 (00:38 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31 am:
5bfe82c3ee am:
12c5f0da9f am:
dc87ac995a am:
02f0044d98
am:
6cadbad153
Change-Id: I05c01c682c89b4ae42ef9f66a94da611c7378148
Nick Kralevich [Tue, 23 May 2017 00:25:35 +0000 (00:25 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413 am:
7a06357519 am:
a07389b446 am:
5f4382e2a6
am:
3946a75cb3
Change-Id: I9992c35cfc2b2ad8c4bbff7bf4bf9ca79b6f4568
Nick Kralevich [Tue, 23 May 2017 00:24:33 +0000 (00:24 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31 am:
5bfe82c3ee am:
12c5f0da9f am:
dc87ac995a
am:
02f0044d98
Change-Id: I8fbd6580c4b6c1595b0ff1c34faaec5e1b9ad4de
Nick Kralevich [Tue, 23 May 2017 00:18:31 +0000 (00:18 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413 am:
7a06357519 am:
a07389b446
am:
5f4382e2a6
Change-Id: Ieab172a133b0d9198cef008b037c4a1107d0746c
Nick Kralevich [Tue, 23 May 2017 00:17:22 +0000 (00:17 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31 am:
5bfe82c3ee am:
12c5f0da9f
am:
dc87ac995a
Change-Id: Ic7e65852a72cde3d2e285774e9cb85e9590e7fd2
Nick Kralevich [Tue, 23 May 2017 00:07:43 +0000 (00:07 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413 am:
7a06357519
am:
a07389b446
Change-Id: I5e8fdff89b3d8d1e36f24767dc60efa1dc352dcb
Nick Kralevich [Tue, 23 May 2017 00:06:55 +0000 (00:06 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31 am:
5bfe82c3ee
am:
12c5f0da9f
Change-Id: I8ce1d6a2399967cf0408adf7ffbe1839f471e1e7
Jack Yu [Sun, 21 May 2017 00:06:33 +0000 (17:06 -0700)]
Added IWLAN metered APN support
If the device is in IWLAN mode, when checking if the APN
type is metered, we read the settings from the IWLAN
metered APN list.
Test: Telephony unit tests
bug:
38304530
Merged-In: I46c9e1a15dd0dd40811d5a959d558fc78608b127
Change-Id: I46c9e1a15dd0dd40811d5a959d558fc78608b127
Nick Kralevich [Mon, 22 May 2017 23:51:48 +0000 (23:51 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413
am:
7a06357519
Change-Id: I9301189268f519d4b87d8c9bfa88d1da4e8a53cd
Nick Kralevich [Mon, 22 May 2017 23:50:57 +0000 (23:50 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31
am:
5bfe82c3ee
Change-Id: I95333a7ff3d6ee1a3161d436a2a0b312931b663e
Nick Kralevich [Mon, 22 May 2017 23:36:12 +0000 (23:36 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9
am:
66a08a5413
Change-Id: Ica5cb7828a37bd597dc0d83f7a65e89380d1e31c
Nick Kralevich [Mon, 22 May 2017 23:35:04 +0000 (23:35 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af
am:
7fd2d8ea31
Change-Id: I4b57d119b9b8d512a017ede0fb62658fb25f9580
Nick Kralevich [Mon, 22 May 2017 23:19:09 +0000 (23:19 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab
am:
55c8a1ede9
Change-Id: Ia3e4d749c5b5475640325fd47eb4260d52e61365
Nick Kralevich [Mon, 22 May 2017 23:18:24 +0000 (23:18 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d
am:
982b8018af
Change-Id: I8cb5052694668ee8021f75778244e4d1b6cc3bb5
Nick Kralevich [Mon, 22 May 2017 23:02:54 +0000 (23:02 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39
am:
47beaa8fab
Change-Id: Ie697e5e8bfb7664b410d564a84ae5784be890f90
Nick Kralevich [Mon, 22 May 2017 23:02:13 +0000 (23:02 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2
am:
f5bd84b82d
Change-Id: I163a9224d6b0ff5f42f52656773e1c297661b977
Nick Kralevich [Mon, 22 May 2017 22:46:18 +0000 (22:46 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8
am:
8965cd6a39
Change-Id: If549cda5fd1a640fee746311745b9b08ebf63b91
Nick Kralevich [Mon, 22 May 2017 22:45:44 +0000 (22:45 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973
am:
c46889e2d2
Change-Id: I840740012d9ba0c434f7de0fd9ca83a44926d018
Nick Kralevich [Mon, 22 May 2017 22:24:39 +0000 (22:24 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c
am:
1cc9ec47c8
Change-Id: Ic81685686dabbc1f0004a30785a021bf89420846
Nick Kralevich [Mon, 22 May 2017 22:23:47 +0000 (22:23 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab
am:
b8d972e973
Change-Id: I4d9e2d9b53523b9182a9f9272d06a93a87b0c61b
Nick Kralevich [Mon, 22 May 2017 22:05:18 +0000 (22:05 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE
am:
4911af2b8c
Change-Id: I4aa46981edb8fd711e1aec8c889528e596e5c233
Nick Kralevich [Mon, 22 May 2017 22:04:57 +0000 (22:04 +0000)]
system_server: add CAP_SYS_PTRACE
am:
966619d0ab
Change-Id: Ie5f95f2c078cd0bec7a2b2321c3303301ec9ec74
Nick Kralevich [Tue, 14 Mar 2017 17:25:35 +0000 (10:25 -0700)]
ZygoteInit: Remove CAP_SYS_RESOURCE
Please see commit
3082eb7c7253c62a06aa151a80487a4eabd49914 for an
explanation of this change.
This capability is not used by system_server.
Bug:
34951864
Bug:
38496951
Test: code compiles, device boots, no selinux errors ever reported.
Change-Id: I4242b1abaa8679b9bfa0d31a1df565b46b7b3cc3
(cherry picked from commit
35775783fc6609035136184e3843bc743b59945d)
Nick Kralevich [Wed, 15 Feb 2017 23:12:31 +0000 (15:12 -0800)]
system_server: add CAP_SYS_PTRACE
Commit https://android.googlesource.com/kernel/common/+/
f0ce0eee added
CAP_SYS_RESOURCE as a capability check which would allow access to
sensitive /proc/PID files. system_server uses this capability to collect
smaps from managed processes. Presumably this was done to avoid the
implications of granting CAP_SYS_PTRACE to system_server.
However, with SELinux enforcement, we can grant CAP_SYS_PTRACE but not
allow ptrace attach() to other processes. The net result of this is that
CAP_SYS_PTRACE and CAP_SYS_RESOURCE have identical security controls, as
long as system_server:process ptrace is never granted.
Add CAP_SYS_PTRACE to the set of capabilities granted to system_server.
Don't delete CAP_SYS_RESOURCE for now. SELinux has blocked the use of
CAP_SYS_RESOURCE, but we still want to generate audit logs if it's
triggered. CAP_SYS_RESOURCE can be deleted in a future commit.
Bug:
34951864
Bug:
38496951
Test: Device boots, functionality remains identical, no sys_resource
denials from system_server.
Change-Id: I2570266165396dba2b600eac7c42c94800d9c65b
(cherry picked from commit
3082eb7c7253c62a06aa151a80487a4eabd49914)
Andrew Scull [Fri, 19 May 2017 14:37:20 +0000 (15:37 +0100)]
NetworkManagementService.java: fix error-prone warnings
- Lock objects should be final
- Inner classes should be static if possible
Change-Id: Idca268e03ea1e9f80e64012d1e011dc8bca1d9a8
Merged-In: Idca268e03ea1e9f80e64012d1e011dc8bca1d9a8
Fix:
38446237
Test: Build
zhouzhijie [Mon, 22 May 2017 11:02:28 +0000 (11:02 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am:
99cf40a25a
am:
3818d4187c
Change-Id: Iafc7ccd9bdd120100ae4063d72379479693142f9
zhouzhijie [Mon, 22 May 2017 10:52:28 +0000 (10:52 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"
am:
99cf40a25a
Change-Id: I9d45fc368e746efa40df96c39719566a201dad45
Treehugger Robot [Mon, 22 May 2017 10:41:38 +0000 (10:41 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"
Erik Kline [Wed, 26 Apr 2017 02:11:07 +0000 (11:11 +0900)]
Refactor TISM add/remove code
This de-duplicates all the TISM adding and teardown code.
It does not yet change the locking or threading semantics.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- manual tethering of WiFi and USB start normally
Bug:
32163131
Bug:
36216864
Change-Id: I44a57660d23e76a7c13368cb8f60eaeac5830a0a
zhoulei [Wed, 17 May 2017 10:41:25 +0000 (18:41 +0800)]
[NotificationManagerService]Support multi users to notification pulse
Turning off the notification light pulse in main userspace, while
all other userspaces would be turned off.
Change-Id: I3a3def7c842bcbe026be21b84c4e855d6f9ff50b
Signed-off-by: zhoulei <zhoulei5@xiaomi.com>
Andre Eisenbach [Sat, 20 May 2017 00:43:16 +0000 (00:43 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am:
a2663b0060
am:
b04d7ceaeb
Change-Id: I66bdfd02f8d5322173ba85a2c427158a237cb215
Andre Eisenbach [Sat, 20 May 2017 00:36:15 +0000 (00:36 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2"
am:
a2663b0060
Change-Id: I015534f9fb860fd0f875bab3d9130de029dc16b9
Andre Eisenbach [Sat, 20 May 2017 00:28:59 +0000 (00:28 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2"
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.
Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
verified that connection and transfer happens over L2CAP.
Connected with Remote PBAP Client supporting PBAP 1.1 and
and verified that connection and transfer happens over RFCOMM.
Bug:
33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
Hugo Benichi [Fri, 19 May 2017 23:24:56 +0000 (23:24 +0000)]
Merge "Address ConnectivityManager API comments." am:
b5d6e45e8d
am:
b57db6ef97
Change-Id: If38be1435c55c66890bb5c702a7b9b23240c0b64
Hugo Benichi [Fri, 19 May 2017 23:14:08 +0000 (23:14 +0000)]
Merge "Address ConnectivityManager API comments."
am:
b5d6e45e8d
Change-Id: I4a29a929e2482d664a969ca38e5f73c3ed816175
Hugo Benichi [Fri, 19 May 2017 23:05:55 +0000 (23:05 +0000)]
Merge "Address ConnectivityManager API comments."
Hall Liu [Fri, 19 May 2017 22:47:06 +0000 (22:47 +0000)]
Merge "Implement stopStreaming API for MBMS" am:
e245bf9067
am:
a7fffdc0d9
Change-Id: I2c1231a3690067edf90070d7d2a5f3919172caf3
OSDN Git Service
