Commit Graph

65395 Commits

Author SHA1 Message Date
Bonian Chen
b9217e8e17 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev 2020-04-25 04:54:04 +00:00
Winson Chung
b7347dd953 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 am: 7b2a48fc58 am: d6c7d72f57
Change-Id: I8d71cecde999f5f96b8ed7b8f3a9dab155161818
2020-04-25 00:05:17 +00:00
Winson Chung
c6132ac4ba Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 3bc117b769 am: 278e875aaa
Change-Id: I4bc99c0bf508cae55e567ef4e3831954a75e7230
2020-04-24 23:50:47 +00:00
Winson Chung
d6c7d72f57 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 am: 7b2a48fc58
Change-Id: Ifb3a2d14183ce06d45056d93d6bd40dace6e0dfc
2020-04-24 23:49:27 +00:00
Winson Chung
7ba7ef4da0 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 am: df8ce9f774
Change-Id: I8103acad6e6cb04c497d3aeb4df9378fcb60b2bb
2020-04-24 23:49:26 +00:00
Winson Chung
278e875aaa Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 3bc117b769
Change-Id: Ib8914abf04029a20a37c9b82c0a459d781427149
2020-04-24 23:34:20 +00:00
Winson Chung
7b2a48fc58 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1
Change-Id: I8c50da5decc4ccdca3eb260cba9b16d48a83c452
2020-04-24 23:33:57 +00:00
Winson Chung
df8ce9f774 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1
Change-Id: I91fb7ba0ea4c14299e7b2cd0f4763815131895bf
2020-04-24 23:33:50 +00:00
Winson Chung
8d4eb8f7b1 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60
Change-Id: I490a0b353d7cdd45485b9a4262362522d64c8dea
2020-04-24 23:22:44 +00:00
Winson Chung
3bc117b769 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60
Change-Id: I122d158b872a5d7b2614265e98c95615492ab20d
2020-04-24 23:22:36 +00:00
Winson Chung
fbfefe5b60 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev 2020-04-24 23:01:36 +00:00
Winson Chung
ec8f79925a Ensure CryptKeeper runs with its own task affinity
- Otherwise, when it finishes and home is started in the same task,
  subsequent launches of Settings activities will be routed to the
  home task incorrectly.

Bug: 154890505
Bug: 150983816
Test: Flash & wipe device, finish SUW, launch a quick settings
      settings activity, ensure it starts in a new non-home task
Change-Id: I48db005a5c292f76ab23b34a194b209c6d1b2335
2020-04-24 22:58:38 +00:00
Amit Mahajan
b6139c0caf Look up CBS package name through PackageManager.
Instead of hardcoding it.

Test: manual
Bug: 154436403
Change-Id: I0feb356e6cd4868f71198bdee49a7658b4b98b5d
2020-04-24 13:46:11 -07:00
TreeHugger Robot
f53c23d9f4 Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f am: a7dec8c44b am: 5ab794b4ce
Change-Id: If5fcb00e87c24a88c361297a9961be3babc8be32
2020-04-24 20:16:22 +00:00
Automerger Merge Worker
c7c18ecbc9 Merge "Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: d506c17694" into rvc-d1-dev-plus-aosp am: 400b08a495
Change-Id: I34b994504dcc1259e40dc54e09e4aa6b7b0fe098
2020-04-24 19:57:43 +00:00
TreeHugger Robot
5ab794b4ce Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f am: a7dec8c44b
Change-Id: I84ff60cd968be7e04b86de079157fc8f5aa0d34f
2020-04-24 19:57:25 +00:00
TreeHugger Robot
7654605718 Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f am: 2a0847f29f
Change-Id: I11eee93c386258ece58fef4b5a198c14a704449e
2020-04-24 19:57:23 +00:00
Automerger Merge Worker
400b08a495 Merge "Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: d506c17694" into rvc-d1-dev-plus-aosp 2020-04-24 19:46:34 +00:00
TreeHugger Robot
a7dec8c44b Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f
Change-Id: I93be53b717c35f54baf164b162822a57258f1e13
2020-04-24 19:46:31 +00:00
TreeHugger Robot
8666d1d120 Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: d506c17694
Change-Id: Ib874ad52f18bfabc768ccd579bc392162f3a366a
2020-04-24 19:46:30 +00:00
TreeHugger Robot
2a0847f29f Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f
Change-Id: I070341c00753fe9783fedee218c8a835d15a96df
2020-04-24 19:46:26 +00:00
TreeHugger Robot
d506c17694 Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b
Change-Id: I8d745265c999e52987827a7a5e3ba2c409ecf481
2020-04-24 19:35:46 +00:00
TreeHugger Robot
5bd1d6693f Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b
Change-Id: I360e3fc7967c71fd07d3a65f69eb7605fe954b2f
2020-04-24 19:35:40 +00:00
TreeHugger Robot
482968c84b Merge "Add SearchIndexable to Power Menu" into rvc-dev 2020-04-24 19:20:51 +00:00
TreeHugger Robot
8ae42f4946 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0dc7e9b328 -s ours am: 5eb3e39812 -s ours am: 36d2098659 -s ours
am skip reason: subject contains skip directive

Change-Id: I627cbbc44421da983e46951db207f502d54bd163
2020-04-24 18:40:59 +00:00
TreeHugger Robot
7829700538 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 39e56f4bee -s ours am: 834552f48b -s ours am: b64aacc143 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d8ace6fdc038ae958c6b34c69c9ccf41b5bfbf6
2020-04-24 18:40:00 +00:00
TreeHugger Robot
8bed7a9dfa [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0dc7e9b328 -s ours am: f16672ea40 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a4bb8cbd20848b8fad829bd465179b4c92e71b6
2020-04-24 18:25:25 +00:00
TreeHugger Robot
9e0b96ab6f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 1f98044eee -s ours am: 4e16f5c8c3 -s ours
am skip reason: subject contains skip directive

Change-Id: I75b28d0f6080bf2e20599643ce3621f3c5466f56
2020-04-24 18:24:37 +00:00
TreeHugger Robot
1c39da4917 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 39e56f4bee -s ours am: 88ea5e29c7 -s ours
am skip reason: subject contains skip directive

Change-Id: I98f45c1a62cb07832c7bbc79ff0cafd4acfad5fd
2020-04-24 18:24:14 +00:00
TreeHugger Robot
36d2098659 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0dc7e9b328 -s ours am: 5eb3e39812 -s ours
am skip reason: subject contains skip directive

Change-Id: I08b4cf960a09a75c555c7df25d3d9012df9eab98
2020-04-24 18:23:59 +00:00
TreeHugger Robot
b64aacc143 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 39e56f4bee -s ours am: 834552f48b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibea0f4c09b7a2aca4613d2be4f7de9ebe7daed23
2020-04-24 18:23:44 +00:00
TreeHugger Robot
f16672ea40 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0dc7e9b328 -s ours
am skip reason: subject contains skip directive

Change-Id: I1484ee6608cea9f359415a81a84bd30c25b06331
2020-04-24 18:07:25 +00:00
TreeHugger Robot
5eb3e39812 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0dc7e9b328 -s ours
am skip reason: subject contains skip directive

Change-Id: Icff8021fcaa0f7944cfd8d962e67586ae392bd70
2020-04-24 18:07:19 +00:00
TreeHugger Robot
834552f48b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 39e56f4bee -s ours
am skip reason: subject contains skip directive

Change-Id: I0f08342bfe3207da22c861167382ec50f1c485b5
2020-04-24 18:07:12 +00:00
TreeHugger Robot
4e16f5c8c3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 1f98044eee -s ours
am skip reason: subject contains skip directive

Change-Id: Iea44cc04492ce77d1de47fd77aa58535e93057e9
2020-04-24 18:07:06 +00:00
TreeHugger Robot
88ea5e29c7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 39e56f4bee -s ours
am skip reason: subject contains skip directive

Change-Id: I22f8ae4d19f380293fb2204927790a613a83511f
2020-04-24 18:06:53 +00:00
TreeHugger Robot
0dc7e9b328 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-24 18:02:01 +00:00
TreeHugger Robot
39e56f4bee [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours
am skip reason: subject contains skip directive

Change-Id: I6453b490eb044cb1663e995fd88c34c46fd66e11
2020-04-24 17:52:20 +00:00
TreeHugger Robot
1f98044eee [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours
am skip reason: subject contains skip directive

Change-Id: Idf9772084f575d243e668645beb712ce9a980cbf
2020-04-24 17:51:49 +00:00
Fabian Kozynski
11c5f9427c Add SearchIndexable to Power Menu
Test: build
Fixes: 154854301
Change-Id: Ibf35ca678b01bc0f1face8f7375defa18593e5a6
2020-04-24 13:51:34 -04:00
TreeHugger Robot
c93aaf860e Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-24 17:33:41 +00:00
Menghan Li
322f86aef6 Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: cda729d547 am: 25a8ce7e3b
Change-Id: Iafe5d5ae5ea50df7b214829bcad7ff2fc2cf8803
2020-04-24 16:51:37 +00:00
Menghan Li
c98eff43f4 Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca am: f52eeb1fac am: 63aa5c6ecd
Change-Id: I3165133b167fc6908c563d6b0642f68b43576145
2020-04-24 16:50:54 +00:00
TreeHugger Robot
eafb81da2b [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 146afc351e -s ours
am skip reason: subject contains skip directive

Change-Id: I51b1166b7fba349b3cbe8d7a98ade9a6ac9adf60
2020-04-24 16:50:45 +00:00
Menghan Li
63aa5c6ecd Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca am: f52eeb1fac
Change-Id: I8f10d72d72eb70e9b07276de4c5ce2a4ab95cca6
2020-04-24 16:50:42 +00:00
Menghan Li
b481b405d8 Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca am: 6977b8f3ab
Change-Id: I54ceec4c334d374f15d06354055815e0ce17a7ac
2020-04-24 16:50:33 +00:00
Menghan Li
25a8ce7e3b Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: cda729d547
Change-Id: I0ce106921a6af834b454fdd29ec0ce2ac4c94e89
2020-04-24 16:41:26 +00:00
Menghan Li
f52eeb1fac Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca
Change-Id: I8a63273d84eabf86730a1ba09df43b418b4a74e5
2020-04-24 16:40:52 +00:00
Menghan Li
6977b8f3ab Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca
Change-Id: I31eaec14f316c602b815d366814dd96e35db2bba
2020-04-24 16:40:24 +00:00
TreeHugger Robot
146afc351e Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-24 16:38:17 +00:00