Bill Yi
6df040b74c
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours am: 623827cd5a
-s ours am: 003d2ff544
-s ours am: f5f5e692f9
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3a2dc98333e122666706269db7ec79ef2d682082
2020-04-27 07:16:16 +00:00
Bill Yi
f5f5e692f9
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours am: 623827cd5a
-s ours am: 003d2ff544
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I4088b5f4ffaebf5a19b4cb3e4a5734a37697e4bd
2020-04-27 07:07:21 +00:00
Bill Yi
829e95c930
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours am: 0c3db58fba
-s ours am: d8cf999ed6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0fd2c9c42fd0df5db8a57ec46889013e0eea9ca1
2020-04-27 07:07:06 +00:00
Bill Yi
d8cf999ed6
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours am: 0c3db58fba
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I197f6c82f40b57592fa304ea398c2e5647e1a07c
2020-04-27 07:00:01 +00:00
Bill Yi
003d2ff544
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours am: 623827cd5a
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie25f6166bb94fa60c5ee05be1158a913bc825735
2020-04-27 07:00:01 +00:00
Bill Yi
623827cd5a
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I81bfa960ca27819b2facbb78a1d19fc8ff6e4169
2020-04-27 06:47:07 +00:00
Bill Yi
0c3db58fba
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: If502679a08e81824062995956094a7fe9e3e0142
2020-04-27 06:46:52 +00:00
Bill Yi
114edb926b
Import translations. DO NOT MERGE
...
Change-Id: If34c66548982270e15e0b607dd3fa7c810ad5f15
Auto-generated-cl: translation import
2020-04-26 22:07:52 -07:00
Amit Mahajan
f082a85b0b
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
am: 89ffb97196
am: 6c78c86bf2
am: 405910d601
...
Change-Id: I7f5675212761f437dc33aa3deb9bb321aaeb7f2b
2020-04-27 00:44:59 +00:00
Amit Mahajan
405910d601
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
am: 89ffb97196
am: 6c78c86bf2
...
Change-Id: If9b12dfb77a511e6cb0ee1b62b03ff0ee01bb50e
2020-04-27 00:38:13 +00:00
Automerger Merge Worker
cc52959c84
Merge "Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: a48e85d028" into rvc-d1-dev-plus-aosp am: a6ce674367
am: e982b1a693
...
Change-Id: I51451454d3230585838a8f317e08fab268d5ed87
2020-04-27 00:38:08 +00:00
Amit Mahajan
9d8672648a
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
am: 1ae72f1886
am: 73af5e5931
...
Change-Id: I099e686e7c97a3a93f5c9537555a0cf4781d1820
2020-04-27 00:38:00 +00:00
Automerger Merge Worker
e982b1a693
Merge "Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: a48e85d028" into rvc-d1-dev-plus-aosp am: a6ce674367
...
Change-Id: Id31d1a201f8be575f49fd780c2e87e031c6c50d0
2020-04-27 00:28:24 +00:00
Amit Mahajan
73af5e5931
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
am: 1ae72f1886
...
Change-Id: I23f77cbdf75a5d6c08e8f99bd9d579ee524aefd2
2020-04-27 00:28:18 +00:00
Amit Mahajan
6c78c86bf2
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
am: 89ffb97196
...
Change-Id: I6857ddde1f6ab8b6936133dda0737ed16fcc6ebd
2020-04-27 00:28:16 +00:00
Automerger Merge Worker
a6ce674367
Merge "Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: a48e85d028" into rvc-d1-dev-plus-aosp
2020-04-27 00:10:41 +00:00
Amit Mahajan
89ffb97196
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
...
Change-Id: Iacbc4bd3e4b6a5353eb98a0b87a0da0769561003
2020-04-27 00:10:34 +00:00
Amit Mahajan
442882451e
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: a48e85d028
...
Change-Id: I924a92ea0b9d30d619a586ae3fc8423bc8cbdfa5
2020-04-27 00:10:34 +00:00
Amit Mahajan
1ae72f1886
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
...
Change-Id: I05a8cb4599ac14ae671690b91d97cbcfc461e2f1
2020-04-27 00:10:29 +00:00
Amit Mahajan
a48e85d028
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
...
Change-Id: I5cb2e64401aa132470b0b771fad4bc50848a809c
2020-04-26 23:52:53 +00:00
Amit Mahajan
4aa834efcd
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
...
Change-Id: Ib7987a370ba181a36b139fbb66b57a9668dfffe6
2020-04-26 23:52:42 +00:00
Amit Mahajan
3becd37d47
Merge "Look up CBS package name through PackageManager." into rvc-dev
2020-04-26 23:41:30 +00:00
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