Bonian Chen
baff61b517
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: f026ac5c41 am: ad2c5922d7 am: 9952eeecbf
...
Change-Id: I3287ea31392f102a83f5914f05c69b7e2809b946
2020-04-25 05:50:46 +00:00
Bonian Chen
ac1c9f55ab
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: a261865632 am: aad8762d24 am: 43463c4abe
...
Change-Id: Ic2305a8f98063a35692c59d2b2d23a2888a91e3a
2020-04-25 05:50:30 +00:00
Bonian Chen
9952eeecbf
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: f026ac5c41 am: ad2c5922d7
...
Change-Id: I2a70f46ee7f82d2e901e939b467849cc507cefab
2020-04-25 05:50:21 +00:00
Bonian Chen
af6cab97b3
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: 1e465439ad am: 944506d7fa
...
Change-Id: I29e6089254883ea5543708ceb1481c2e40f6ae18
2020-04-25 05:50:14 +00:00
Bonian Chen
43463c4abe
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: a261865632 am: aad8762d24
...
Change-Id: Iedbd131d2903a9d2531139dfa33d3a8727c6f962
2020-04-25 05:34:18 +00:00
Bonian Chen
ad2c5922d7
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: f026ac5c41
...
Change-Id: I2235663d84425573cf3d50be2555fc21cf0c31db
2020-04-25 05:34:13 +00:00
Bonian Chen
944506d7fa
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: 1e465439ad
...
Change-Id: Ib673c1cc058d1329d1acbc29845d3695e4caabe8
2020-04-25 05:34:02 +00:00
Bonian Chen
f026ac5c41
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d
...
Change-Id: I8efd4f26c856894af826ccbc42258d3bcd848b89
2020-04-25 05:21:08 +00:00
Bonian Chen
aad8762d24
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: a261865632
...
Change-Id: Ic1d3d8d855dd68abedf03a79f9063847ea1e300e
2020-04-25 05:21:07 +00:00
Bonian Chen
1e465439ad
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d
...
Change-Id: Ia12ae46141f42366faed193e1bb344251a672290
2020-04-25 05:20:51 +00:00
Bonian Chen
a261865632
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17
...
Change-Id: If8d10cc456874cb1772ce51aacf624b1467f47f2
2020-04-25 05:06:50 +00:00
Bonian Chen
7976cfc02d
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17
...
Change-Id: Ifc346d43a3a7209304048da212f35326f543308f
2020-04-25 05:06:36 +00:00
Bonian Chen
b9217e8e17
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev
2020-04-25 04:54:04 +00:00
Winson Chung
71922d920c
Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 am: 7b2a48fc58 am: d6c7d72f57 am: b7347dd953
...
Change-Id: Ie0aff2a3c44287833c9ae3d78063e9ee4cc0cc75
2020-04-25 00:08:03 +00:00
Winson Chung
4fe0145d84
Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 3bc117b769 am: 278e875aaa am: c6132ac4ba
...
Change-Id: Icee479b64a14b9a3da1c5954978c48d7374d6568
2020-04-25 00:07:29 +00:00
Winson Chung
65911b9a22
Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 am: df8ce9f774 am: 7ba7ef4da0
...
Change-Id: I21d05da80f63faa12add386faa2dae3d87c88a8a
2020-04-25 00:05:55 +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
6d1523f523
Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f am: a7dec8c44b am: 5ab794b4ce am: f53c23d9f4
...
Change-Id: I5c95d1543a03238e92d63ea9a8ba339183205b0d
2020-04-24 20:16:49 +00:00
Automerger Merge Worker
ee0e9e8e49
Merge "Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: d506c17694" into rvc-d1-dev-plus-aosp am: 400b08a495 am: c7c18ecbc9
...
Change-Id: I1d1a7945f1b3650ce9fa0ef1ae38b147f59e708a
2020-04-24 20:16:27 +00: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
TreeHugger Robot
7874d035fe
Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f am: 2a0847f29f am: 7654605718
...
Change-Id: I16948376f872d7d9b4008b571648201eba5c9b6c
2020-04-24 20:16:01 +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
TreeHugger Robot
f94fc3c337
Merge "Import translations. DO NOT MERGE"
2020-04-24 19:47:28 +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
1ac457ebb8
Merge "Import translations. DO NOT MERGE"
2020-04-24 19:12:20 +00:00
TreeHugger Robot
3b37233e98
[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: 8ae42f4946 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1c056cee9a490bb6639f3e293bb7582de7e600cf
2020-04-24 18:44:20 +00:00
TreeHugger Robot
18f6c28acd
[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: 7829700538 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie496bcc47430fef7a86ed0c3b06ff456aaf0539d
2020-04-24 18:43:55 +00:00
TreeHugger Robot
15d1d1e381
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0dc7e9b328 -s ours am: f16672ea40 -s ours am: 8bed7a9dfa -s ours
...
am skip reason: subject contains skip directive
Change-Id: I608a5ff309f0782b1404b6562fbfc14a95065243
2020-04-24 18:43:02 +00:00
TreeHugger Robot
558961be0b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 1f98044eee -s ours am: 4e16f5c8c3 -s ours am: 9e0b96ab6f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I064baa298579709b5debb15c8448ab52211d650a
2020-04-24 18:42:12 +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
d1cdd4a30e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 39e56f4bee -s ours am: 88ea5e29c7 -s ours am: 1c39da4917 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I71f356cc4f28fa9e1514cbda787bc3b621897959
2020-04-24 18:40:54 +00:00
