OSDN Git Service
Rubin Xu [Tue, 23 May 2017 02:01:11 +0000 (02:01 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev am:
da3d71f01e
am:
90c197d35d -s ours
Change-Id: If43d86a65d7b8d8d210bc64e9772b532374d7662
Nick Kralevich [Tue, 23 May 2017 01:58:46 +0000 (01:58 +0000)]
Merge changes from topic 'am-
3c32cf60aa7d4143a4aec89ba3f5325d' into oc-dev-plus-aosp
am:
58fa4b99ad
Change-Id: Ifcd69cc5b3b8f8494aca2e8b2d2916f2e1a4b154
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
Nick Kralevich [Tue, 23 May 2017 01:50:54 +0000 (01:50 +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
am:
c70f822a45
Change-Id: Icffe9cc3cc22892b98b2a0892129bbf003d502fd
Nick Kralevich [Tue, 23 May 2017 01:49:27 +0000 (01:49 +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
am:
a6ab95d0e6
Change-Id: Iba01b1b84fb1e07acb158670260f34e6f99cb97e
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
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
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:34:10 +0000 (01:34 +0000)]
Merge "Bump overlay version number." into oc-dev am:
daa0f4026a
am:
ad8f7cb3ee
Change-Id: Idda6d2aa29e8dc07e18f937f4268136d0c60da19
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
TreeHugger Robot [Tue, 23 May 2017 00:53:32 +0000 (00:53 +0000)]
Merge "Metrics proto update for Assist gesture training"
Todd Kennedy [Tue, 23 May 2017 00:49:12 +0000 (00:49 +0000)]
Merge "Blanket deny instant apps from some methods" into oc-dev am:
dc28b0fdcb
am:
d86e938cbf
Change-Id: I376bd49c0b4affb514a613f2382b12c204981997
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
Fan Zhang [Tue, 23 May 2017 00:47:02 +0000 (00:47 +0000)]
Merge "Align preference text to actionbar title." into oc-dev am:
eb4712d7bd
am:
9a9142f9f4
Change-Id: I3d376cfa00673759973389647c3a4659a8321bf0
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
TreeHugger Robot [Tue, 23 May 2017 00:44:51 +0000 (00:44 +0000)]
Merge "Preserve order of a11y events"
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
Suprabh Shukla [Tue, 23 May 2017 00:40:39 +0000 (00:40 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev am:
7a940ac844
am:
170915b4ac
Change-Id: I0c35b373c39a61288e7c6058a2471726a42c4b97
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
Sudheer Shanka [Tue, 23 May 2017 00:32:12 +0000 (00:32 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev am:
9765bcf761
am:
679af1adeb
Change-Id: Ifea505897f0d6bdc269cf5e14f05cbf1fa7d7cd8
Sudheer Shanka [Tue, 23 May 2017 00:26:36 +0000 (00:26 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev am:
fdeb6b8ed3
am:
7c1598d5e8
Change-Id: I82502ee6740a451b23fcef8c5383988615ff7651
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
Matthew Ng [Tue, 23 May 2017 00:24:28 +0000 (00:24 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev am:
7f48176022
am:
4319ddf8c7
Change-Id: I01035e5b996236ed8a4772fd27c65a7235f59fca
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
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
Winson Chung [Mon, 22 May 2017 23:44:39 +0000 (23:44 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev am:
bc13f7174a
am:
9862cd02be
Change-Id: I69dbb891acbfefb7c9547cb5b58e4d19011fdb3a
Jerry Zhang [Mon, 22 May 2017 23:42:19 +0000 (23:42 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev am:
3a958a09d2
am:
59c8132116 -s ours
Change-Id: Ie95427a7ee05c01d58a7440ff78cb0ae77646297
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
Jack Yu [Mon, 22 May 2017 23:21:00 +0000 (23:21 +0000)]
Merge "Added IWLAN metered APN support"
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
Eugene Susla [Mon, 22 May 2017 23:18:00 +0000 (23:18 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev am:
c1e3ab359f
am:
7f0e3b5996
Change-Id: I033327cd9ff7c24aa6f6eeba07cd96af15227ae4
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
Maurice Lam [Mon, 15 May 2017 22:59:59 +0000 (15:59 -0700)]
Metrics proto update for Assist gesture training
Test: Manual
Bug:
37427306
Bug:
37329077
Change-Id: I8b83f3bcba1bb7c22a52698ffd11c6eb40b45e7d
Jiaquan He [Mon, 22 May 2017 22:58:09 +0000 (22:58 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev am:
badb83b332
am:
806ee59c00
Change-Id: I83152e4405573b21e92fc92190bee9bae82d101b
George Mount [Mon, 22 May 2017 22:54:43 +0000 (22:54 +0000)]
Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev am:
78af0424fe
am:
eb109450a5
Change-Id: I7c0b717df15648a217badd7a745680792bbb4539
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
Bryce Lee [Mon, 22 May 2017 22:43:42 +0000 (22:43 +0000)]
Merge "Remove all activities that do not successfully launch." into oc-dev am:
1a08d200fb
am:
1f459d2f32
Change-Id: I2d8eef0575d3b8282eb46aff7a0f4afe73bfebf5
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
Julia Reynolds [Mon, 22 May 2017 22:32:02 +0000 (22:32 +0000)]
Merge "Re-add default channel on app targetsdk downgrade." into oc-dev am:
4c11bde01d
am:
c17f1d9c9b
Change-Id: Ie26680bf227427c05167af7a32313f199ed7ae7d
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
TreeHugger Robot [Mon, 22 May 2017 21:54:22 +0000 (21:54 +0000)]
Merge "MediaPlayer: fix typo in stop() documentation"
Erik Wolsheimer [Mon, 22 May 2017 21:52:05 +0000 (21:52 +0000)]
Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev am:
ce7e3e3a90
am:
5ef26b63c6
Change-Id: I737b16c2c7a990dc808bfa6af297288c40e1e934
TreeHugger Robot [Mon, 22 May 2017 21:46:29 +0000 (21:46 +0000)]
Merge "Ignore RoundedCornersTest until flake is fixed"
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
Eugene Susla [Mon, 22 May 2017 20:14:57 +0000 (13:14 -0700)]
Preserve order of a11y events
Test: cts-tradefed run singleCommand cts -d --module CtsAccessibilityServiceTestCases
cts-tradefed run singleCommand cts -d --module CtsAccessibilityTestCases
cts-tradefed run singleCommand cts -d --module CtsUiAutomationTestCases
Change-Id: I6a9230473f79148a3da9808d67d9e0c80abc8384
Matthew Ng [Mon, 22 May 2017 21:08:07 +0000 (21:08 +0000)]
Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev am:
97960fbf84
am:
f61883caa8
Change-Id: I5a39bc6661ea9ec378d904b6002471e4d4a0866d
Rubin Xu [Mon, 22 May 2017 21:00:13 +0000 (21:00 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid"
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
Dianne Hackborn [Mon, 22 May 2017 20:20:38 +0000 (20:20 +0000)]
Merge "Fix issue #
38393543: Not allowed to start service Intent" into oc-dev am:
ad6dde65ff
am:
7fdeb9ff3f
Change-Id: Ie6cfe023f733079d3fb685b841bc0e90506c0ab3
Jiaquan He [Thu, 11 May 2017 18:56:43 +0000 (11:56 -0700)]
Do not relayout on default focus highlight.
Test: AdjacentListsWithAdjacentISVsInsideTest.testFocusedRectAndFocusHintWorkWithinListItemHorizontal
Bug:
38195445
Change-Id: I4ba61d1dd6b806bff5305986a086c436c3b05b12
Todd Kennedy [Mon, 22 May 2017 20:07:55 +0000 (13:07 -0700)]
fix import order
Test: manual
Change-Id: Idb5793bd322b27fdd5d60f5c8a552a38d3eedfa5
Dianne Hackborn [Mon, 22 May 2017 20:09:29 +0000 (20:09 +0000)]
Merge "Fix issue #
38393543: Not allowed to start service Intent" into oc-dev
am:
ad6dde65ff
Change-Id: Ife26f513fa6d04771148a3965171822874854828
Matthew Ng [Wed, 17 May 2017 22:03:18 +0000 (15:03 -0700)]
Fixes landscape minimized bounds for launcher hiding widget control
Adds the statusbar height to the left bound of the launcher when in
minimized mode forgotten when added to the docked app in ag/
2126615.
That bug requested to add the statusbar height to the docked stack
making it larger.
Test: manual, go into minimized state, drag a widget from launcher
Change-Id: I11e6f5b9154bc7ade026f230849adc2c722a9626
Fixes:
38301371
Dianne Hackborn [Mon, 22 May 2017 20:03:29 +0000 (20:03 +0000)]
Merge "Fix issue #
38393543: Not allowed to start service Intent" into oc-dev
Julia Reynolds [Mon, 22 May 2017 19:47:06 +0000 (15:47 -0400)]
Re-add default channel on app targetsdk downgrade.
Test: runtest systemui-notification, and manual: adb install the
apk pulled off dogfood device, verify that sending an email
results in a toast pre change and no toast + notification
post change.
Change-Id: Ia3db55959906f38a5dc34cb38a33072c1f2dd64f
Fixes:
38437227
OSDN Git Service
