OSDN Git Service
Hugo Benichi [Tue, 23 May 2017 06:37:24 +0000 (06:37 +0000)]
Merge "ConnectivityManager: simplify callback handler" am:
857e7d9c85 am:
7bce658dd6
am:
a67fb638fa
Change-Id: I3934666df4a02101351993f7f83fb0a42124a2f5
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"
Erik Kline [Tue, 23 May 2017 05:12:44 +0000 (05:12 +0000)]
Merge "Refactor TISM add/remove code" am:
5041bbde19 am:
c85053f7eb
am:
2e33be3ca9
Change-Id: Ic1bcb3ca011bdc886086f34be18409eb5b12f521
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
Hugo Benichi [Tue, 23 May 2017 04:56:41 +0000 (04:56 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am:
a82cac1452 am:
004f36d5bc
am:
eb9d0f16aa
Change-Id: Ic792060aafb5aa8b485054be18c3dba82bb15a3b
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:44:13 +0000 (03:44 +0000)]
Merge "Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74" into nyc-mr2-dev-plus-aosp am:
7ee4542d17" into oc-dev-plus-aosp
Hugo Benichi [Tue, 23 May 2017 03:43:21 +0000 (03:43 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74" into nyc-mr2-dev-plus-aosp
am:
7ee4542d17
Change-Id: Ibe3c29fa1c483965531694b3d4b8f6a8154e546d
Android Build Merger (Role) [Tue, 23 May 2017 03:42:45 +0000 (03:42 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74 am:
b800e8520e" into oc-dev-plus-aosp
Hugo Benichi [Tue, 23 May 2017 03:41:52 +0000 (03:41 +0000)]
Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74
am:
b800e8520e
Change-Id: Idfc0938025c633c89f5bfddd88b3721876d085ef
Android Build Merger (Role) [Tue, 23 May 2017 03:41:21 +0000 (03:41 +0000)]
Merge "Merge "Added IWLAN metered APN support" am:
70fe11fc38 am:
ab48527680 am:
b8f3e388fc" into oc-dev-plus-aosp
Jack Yu [Tue, 23 May 2017 03:39:49 +0000 (03:39 +0000)]
Merge "Added IWLAN metered APN support" am:
70fe11fc38 am:
ab48527680
am:
b8f3e388fc
Change-Id: Ia03104b1604bb34c6993171e848aa6193409726a
Wale Ogunwale [Tue, 23 May 2017 03:38:03 +0000 (03:38 +0000)]
Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev
am:
540cb28c5a
Change-Id: I188f1e181ff7feab8d1da92f6ef72ac43d47719c
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
TreeHugger Robot [Tue, 23 May 2017 03:32:38 +0000 (03:32 +0000)]
Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev
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"
Robert Carr [Tue, 23 May 2017 02:36:21 +0000 (02:36 +0000)]
Merge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev
am:
42c6529c1d
Change-Id: I5f883c2760e8056d2130d232fb7ca43576339a17
TreeHugger Robot [Tue, 23 May 2017 02:32:13 +0000 (02:32 +0000)]
Merge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev
Rubin Xu [Tue, 23 May 2017 01:51:08 +0000 (01:51 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
am:
da3d71f01e
Change-Id: I8000419d8abd92b247b7de6b5816cc43883facd1
Android Build Merger (Role) [Tue, 23 May 2017 01:47:06 +0000 (01:47 +0000)]
Nick Kralevich [Tue, 23 May 2017 01:45:52 +0000 (01:45 +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
am:
87cef51e2b
Change-Id: Ib75547b414bd593ecadcba0cb483da4671f4bf7f
TreeHugger Robot [Tue, 23 May 2017 01:45:37 +0000 (01:45 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
Nick Kralevich [Tue, 23 May 2017 01:44:24 +0000 (01:44 +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 -s ours
am:
ac9121b73a
Change-Id: Ib5dfae4d8cf649b4e2bddda218091cb946a9a3cc
Wale Ogunwale [Tue, 23 May 2017 01:43:59 +0000 (01:43 +0000)]
Revert "Changed alert window notifications to use single channel"
This reverts commit
8f7bebca3656f4993edef290e62c960f245ff373.
We now want multiple channels so the user can disable which ever ones they like.
Change-Id: I6015cd5f1e3f37a8a01e1db42b57a94087780304
Fixes:
38428796
Bug:
37422870
Nick Kralevich [Tue, 23 May 2017 01:43:14 +0000 (01:43 +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
am:
604a49118f
Change-Id: I7b681f224f6f57eb6fea644fcb04d5b5f3614233
Nick Kralevich [Tue, 23 May 2017 01:41:51 +0000 (01:41 +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
am:
f00f966fcf -s ours
Change-Id: I5813d8d1906a199e6d79a9c46c7df75e24089f52
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
Nick Kralevich [Tue, 23 May 2017 01:37:59 +0000 (01:37 +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: I9cd7b091b2ce4640a1d7729fb081aef9a3186ab8
Nick Kralevich [Tue, 23 May 2017 01:36:35 +0000 (01:36 +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 -s ours
Change-Id: If386c7ba25e1c8d1730e7191abb48ba75971d8af
Andrew Sapperstein [Tue, 23 May 2017 01:25:22 +0000 (01:25 +0000)]
Merge "Bump overlay version number." into oc-dev
am:
daa0f4026a
Change-Id: Id62d3e337bc9f582b2344a8ef6b43cc533b81189
TreeHugger Robot [Tue, 23 May 2017 01:20:33 +0000 (01:20 +0000)]
Merge "Bump overlay version number." into oc-dev
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
Todd Kennedy [Tue, 23 May 2017 00:41:32 +0000 (00:41 +0000)]
Merge "Blanket deny instant apps from some methods" into oc-dev
am:
dc28b0fdcb
Change-Id: I401af533ebec4826c57a7ea2e7b83096f3c27a14
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
Fan Zhang [Tue, 23 May 2017 00:39:34 +0000 (00:39 +0000)]
Merge "Align preference text to actionbar title." into oc-dev
am:
eb4712d7bd
Change-Id: I3dc67fe6dde23f8024ed2c2add53651153bd49ba
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
Suprabh Shukla [Tue, 23 May 2017 00:33:15 +0000 (00:33 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
am:
7a940ac844
Change-Id: I2f67d726346362796f12f83540f8bbc1e3f12cc1
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
TreeHugger Robot [Tue, 23 May 2017 00:24:35 +0000 (00:24 +0000)]
Merge "Blanket deny instant apps from some methods" into oc-dev
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
TreeHugger Robot [Tue, 23 May 2017 00:22:44 +0000 (00:22 +0000)]
Merge "Align preference text to actionbar title." into oc-dev
Sudheer Shanka [Tue, 23 May 2017 00:22:36 +0000 (00:22 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
am:
9765bcf761
Change-Id: I0843273dd409075eb924e88854309b7b502b09d0
Sudheer Shanka [Tue, 23 May 2017 00:20:34 +0000 (00:20 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev
am:
fdeb6b8ed3
Change-Id: I241535a379b8e3cf547d73c05fe0dc7298ccc958
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
Matthew Ng [Tue, 23 May 2017 00:16:05 +0000 (00:16 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev
am:
7f48176022
Change-Id: I3aa5adcd7e16b36c7d614330a68d698210e63954
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
TreeHugger Robot [Tue, 23 May 2017 00:02:13 +0000 (00:02 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
Sudheer Shanka [Tue, 23 May 2017 00:01:54 +0000 (00:01 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
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
Sudheer Shanka [Mon, 22 May 2017 23:51:56 +0000 (23:51 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev
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
TreeHugger Robot [Mon, 22 May 2017 23:50:06 +0000 (23:50 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev
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
Winson Chung [Mon, 22 May 2017 23:30:08 +0000 (23:30 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev
am:
bc13f7174a
Change-Id: Ifa487b7d65ad5a3c21654c6910fb785d47a1a0f1
Jerry Zhang [Mon, 22 May 2017 23:27:43 +0000 (23:27 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
am:
3a958a09d2
Change-Id: If10f8cf662369ecbb95bc6f04388271a535cd259
Winson Chung [Mon, 22 May 2017 23:20:09 +0000 (23:20 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev
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
Jerry Zhang [Mon, 22 May 2017 23:13:53 +0000 (23:13 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
Eugene Susla [Mon, 22 May 2017 23:09:13 +0000 (23:09 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev
am:
c1e3ab359f
Change-Id: Ia856f6b9c5db4f5b061930469650321bc1452497
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
Eugene Susla [Mon, 22 May 2017 22:54:34 +0000 (22:54 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev
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
Jiaquan He [Mon, 22 May 2017 22:36:42 +0000 (22:36 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev
am:
badb83b332
Change-Id: I7174ffcfef9d32b4b7559251060cea8ce8a34d58
Jiaquan He [Mon, 22 May 2017 22:25:09 +0000 (22:25 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev
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
George Mount [Mon, 22 May 2017 22:17:58 +0000 (22:17 +0000)]
Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
am:
78af0424fe
Change-Id: Ie176c340d3be10f6173fdc23c899c797197a918e
Bryce Lee [Mon, 22 May 2017 22:15:23 +0000 (22:15 +0000)]
Merge "Remove all activities that do not successfully launch." into oc-dev
am:
1a08d200fb
Change-Id: I3c64a124b326b96ee38d55bef230d469e34e3db8
Julia Reynolds [Mon, 22 May 2017 22:12:45 +0000 (22:12 +0000)]
Merge "Re-add default channel on app targetsdk downgrade." into oc-dev
am:
4c11bde01d
Change-Id: Ied0dc35d017d7bf716a121979e6839c3b2ec494f
TreeHugger Robot [Mon, 22 May 2017 22:07:11 +0000 (22:07 +0000)]
Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:05:54 +0000 (22:05 +0000)]
Merge "Remove all activities that do not successfully launch." into oc-dev
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
TreeHugger Robot [Mon, 22 May 2017 22:03:00 +0000 (22:03 +0000)]
Merge "Re-add default channel on app targetsdk downgrade." into oc-dev
Erik Wolsheimer [Mon, 22 May 2017 21:33:55 +0000 (21:33 +0000)]
Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev
am:
ce7e3e3a90
Change-Id: Id0a0eb6757e5ddc0af7ad6844f78bbb0a51a8f58
TreeHugger Robot [Mon, 22 May 2017 21:24:24 +0000 (21:24 +0000)]
Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev
Matthew Ng [Mon, 22 May 2017 20:56:00 +0000 (20:56 +0000)]
Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev
am:
97960fbf84
Change-Id: I38b00abe92611b8a87b2355f7e104f84a384172e
Matthew Ng [Mon, 22 May 2017 20:47:06 +0000 (20:47 +0000)]
Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev
OSDN Git Service
