Automerger Merge Worker
c2d1dd1acb
Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp am: 6780306ec1 am: e6dbeccec1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I89feba9fe1176eb0a14428cfcee5a3ae46cba8cd
2020-06-11 10:43:36 +00:00
András Klöczl
9037d1110a
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02 am: 6c9f5797c4 am: d209f1e782
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I56d518577bb42ef1e6562233eb67585c486f8365
2020-06-11 10:43:21 +00:00
András Klöczl
ab75e5db0d
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: 4e2a9a04e3 am: 46bfb08216 am: e551663f17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I29748d10062bcf3add38708b7691ca59d2f9e483
2020-06-11 10:43:08 +00:00
Jason Chiu
3c3f362125
Improve BT slice card loading performance
...
The bottleneck is getting LocalBluetoothManager the first time.
1. Initialize LocalBluetoothManager earlier and asynchronously.
2. Don't block in slice's constructor and getSlice().
- Initialize the bt updaters until the manager is ready.
- Just show a header if the manager is not ready yet.
Fixes: 157702021
Test: robotest
Change-Id: I427df55f259b45ba4c37557b22e09dcc24079e93
2020-06-11 18:39:29 +08:00
Automerger Merge Worker
e6dbeccec1
Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp am: 6780306ec1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Ia21b19dc03ca5c41f245ece90a71a294f9fb6601
2020-06-11 10:26:19 +00:00
András Klöczl
d209f1e782
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02 am: 6c9f5797c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Ic951f913a15aab58cef686b19ccc4ac46f9f1947
2020-06-11 10:26:01 +00:00
András Klöczl
e551663f17
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: 4e2a9a04e3 am: 46bfb08216
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I4cdd72a6dbca4d802ed8c3ea13d7e0b1777fbec3
2020-06-11 10:25:37 +00:00
Automerger Merge Worker
6780306ec1
Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp
2020-06-11 09:57:59 +00:00
András Klöczl
1b3e5c7aed
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Ic015fa7828a7c32a4238a8cf3deeacf384dc6da5
2020-06-11 09:57:50 +00:00
András Klöczl
6c9f5797c4
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I6c4c422029277e7d23a5a39ef79b037cc14d3a01
2020-06-11 09:57:49 +00:00
András Klöczl
46bfb08216
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: 4e2a9a04e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I4db1231c83ca921c975f1ef273c4e650e6ff3f23
2020-06-11 09:57:38 +00:00
András Klöczl
28fd271f02
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I4a3c91a7a33147753764d93ed307c5cf166ac101
2020-06-11 09:35:32 +00:00
András Klöczl
4e2a9a04e3
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Idf895f299526d9eacdd139d8dbe77e98c22d1e1d
2020-06-11 09:35:24 +00:00
András Klöczl
b04ad237c9
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I437174b4527d3cc15527b62b409cfa9a5b9d35ac
2020-06-11 09:35:22 +00:00
András Klöczl
cfe3027432
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I56ac089933167479e20ccdb731e5b506dfbbbf48
2020-06-11 09:01:25 +00:00
András Klöczl
974efbd7f2
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Ie3c8012398740f0629ef89fce1574cb21f91667d
2020-06-11 09:01:15 +00:00
András Klöczl
f8754b4deb
Merge "Change user setup prompt dialog showing logic" into rvc-dev
2020-06-11 08:47:07 +00:00
tim peng
6cda035060
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c0681db2b9 am: f78d9578c0 am: 7e7ca4d301
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I9eacf47a2ed6139674e273a8956a3259d72a2b43
2020-06-11 07:16:53 +00:00
Automerger Merge Worker
4559ac681a
Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92" into rvc-d1-dev-plus-aosp am: dc4e43c9a7 am: 8a726c0463 am: ac845abc2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I233539d0b77c6c75a7716391610840f80870fa23
2020-06-11 07:16:34 +00:00
tim peng
81a8b86e69
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c7005e8f1c am: 9987574e34 am: c9e1ee11f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I179b741dbd53551cac2147a111385548701a4936
2020-06-11 07:15:57 +00:00
tim peng
7e7ca4d301
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c0681db2b9 am: f78d9578c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: If84067f0878b8e4abf5b2c58dc3d2a10e0fb8db0
2020-06-11 06:58:09 +00:00
Automerger Merge Worker
ac845abc2f
Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92" into rvc-d1-dev-plus-aosp am: dc4e43c9a7 am: 8a726c0463
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I5ed3de75b04f6e865f53f86f8589b46d984ad4d9
2020-06-11 06:58:02 +00:00
tim peng
c9e1ee11f0
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c7005e8f1c am: 9987574e34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I52fbba9b0a84908236ca1a3745d8d17b08305175
2020-06-11 06:57:48 +00:00
tim peng
f78d9578c0
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c0681db2b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: Icd6805e6b35410430fbeb796e2ad056969292f1b
2020-06-11 06:35:06 +00:00
Automerger Merge Worker
8a726c0463
Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92" into rvc-d1-dev-plus-aosp am: dc4e43c9a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: Iedcb9fd181a5b85a4f7cca137e9cb4ed3d108563
2020-06-11 06:34:56 +00:00
tim peng
9987574e34
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1 am: c7005e8f1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I7f0c4391029662e539454e6a6f3b70719e8aa649
2020-06-11 06:34:46 +00:00
Automerger Merge Worker
dc4e43c9a7
Merge "Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92" into rvc-d1-dev-plus-aosp
2020-06-11 06:24:36 +00:00
tim peng
38def3982b
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 0022d19d92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I4945ef1b7e42bc3c9a617747559f0a1d2f6da0c5
2020-06-11 06:24:32 +00:00
tim peng
c7005e8f1c
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: Ia0b24f6991b290a35261611245b1dd592a621acb
2020-06-11 06:24:26 +00:00
tim peng
c0681db2b9
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829 am: 8aa018d1b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: I49990d0d2b1010a0576ee083830b3e11e9f7f247
2020-06-11 06:24:23 +00:00
tim peng
0022d19d92
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: Ic25cbabe73970d7e53d09dd1ca3b426998c2e8aa
2020-06-11 06:09:41 +00:00
tim peng
8aa018d1b1
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev am: 359d3ac829
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10987459
Change-Id: Ic22de77b2dae64bf64b7f0be29abad135e85c70b
2020-06-11 06:09:38 +00:00
tim peng
359d3ac829
Merge "Apply RangeBuilder amination for media transferring" into rvc-dev
2020-06-11 05:55:21 +00:00
Yanting Yang
62b15ac669
Update App info behavior for mainline module
...
As requested by framework team, the mainline module should be considered
as system apps and not stoppable and disable-able. Since many of these
modules provide critical functionality, disabling them can result in a
very unstable device.
According to the request, Settings will apply below changes to App info
page for protecting mainline modules:
- Hide "Force stop" and "Disable" in App info.
- Disable "Clear storage" and "Clear cache" in "Storage & cache".
Since the mainline module checking API interface changed, also change
the dependent files and test cases.
Fixes: 156955322
Test: robotest and verify "Cell Broadcast Service" in App info
Change-Id: Ibc239bdaf3364eda541a33add382364cfdc6fc9b
2020-06-11 13:04:55 +08:00
TreeHugger Robot
694a1c06e0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours am: 3a1615a1e2 -s ours am: 5336704da5 -s ours am: 0488b8ff6f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: Ic46bdae510ca55bf2129ca1d9bd4d88ccbb7f6df
2020-06-11 03:02:13 +00:00
TreeHugger Robot
15beb25d2e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours am: 67e8c6b1e9 -s ours am: 47c275fd85 -s ours am: 718cb65844 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: I2c0d64b0378f9616b44929ee5d3deb7f42408b49
2020-06-11 03:01:48 +00:00
TreeHugger Robot
0488b8ff6f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours am: 3a1615a1e2 -s ours am: 5336704da5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: I729a7ad72ea897bd00e73a37b492c7eb57b1302b
2020-06-11 02:37:20 +00:00
TreeHugger Robot
718cb65844
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours am: 67e8c6b1e9 -s ours am: 47c275fd85 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: I77740edc0058da49b734a663867e9e29ffa33f45
2020-06-11 02:36:49 +00:00
TreeHugger Robot
5336704da5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours am: 3a1615a1e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: I03182b24d7e7111b895e59ce822ce595b1e81547
2020-06-11 02:25:41 +00:00
TreeHugger Robot
47c275fd85
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours am: 67e8c6b1e9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: I962e646fd8a8fb34b0b819cd2b5a7d4a462e73a6
2020-06-11 02:25:27 +00:00
TreeHugger Robot
3a1615a1e2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: I50105320a02c308163739e04fb82bdb92baa9522
2020-06-11 02:10:25 +00:00
TreeHugger Robot
67e8c6b1e9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 95ac1222d8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818815
Change-Id: Ieb440bf082161fb7707adfc9edd369b2212c86b9
2020-06-11 02:10:17 +00:00
TreeHugger Robot
95ac1222d8
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-06-11 01:56:48 +00:00
TreeHugger Robot
65ca86642f
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: c4c1f8b0c8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826879
Change-Id: I05eedcd57d829f7ffbf226c5bf37518306c4b00f
2020-06-11 00:23:38 +00:00
TreeHugger Robot
df2a58f833
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 2077c5647e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11817983
Change-Id: I84877c869b097ad84bb7d74b1df01067ac07653c
2020-06-11 00:22:19 +00:00
TreeHugger Robot
c4c1f8b0c8
Merge "Import translations. DO NOT MERGE"
2020-06-11 00:12:15 +00:00
TreeHugger Robot
2077c5647e
Merge "Import translations. DO NOT MERGE"
2020-06-11 00:04:09 +00:00
Joshua Duong
76d2afb832
[adbwifi] Handle tls port changes.
...
Events such as adbd restarts can change the connection port. We need
to update the UI accordingly.
Bug: 158219145
Test: Manual.
1) Enable wireless debugging in Settings and validate port in UI via
> adb shell su 0 netstat -plnt | grep LISTEN
2) Restart adbd: > adb root
3) validate port again (may have changed)
Change-Id: I93339a6a258fbf69fa3f45186863a01126d279ce
2020-06-10 16:56:29 -07:00
TreeHugger Robot
4ec4ad5c3b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 428bc4f51d -s ours am: dfc8a8bd59 -s ours am: 676769c8c8 -s ours am: 3cf9502c97 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818803
Change-Id: I3f247b67105360fae9ea455d0c50d5642ed8d274
2020-06-10 23:47:37 +00:00
TreeHugger Robot
d6b0a80245
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 428bc4f51d -s ours am: 9899db6e9d -s ours am: 224042084b -s ours am: 56ca196288 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818803
Change-Id: I7a3ee8f19a592a4847e3eafbcd8287d136ccda20
2020-06-10 23:46:19 +00:00