Commit Graph

109896 Commits

Author SHA1 Message Date
Treehugger Robot
f4ef31b17e Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 am: 325b033f85 am: 8c4db8e545 am: e6901aedba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422

Change-Id: Ifea8d6dfd652cf73ac9361c1224635bf6169a389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 13:41:22 +00:00
Treehugger Robot
e6901aedba Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 am: 325b033f85 am: 8c4db8e545
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422

Change-Id: Ic87c58e6eb59b154258a97ff54c0e5295637af12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 13:15:30 +00:00
Treehugger Robot
8c4db8e545 Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 am: 325b033f85
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422

Change-Id: Ie9d5325556a31c72af3520879212e5fc526ea0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 12:45:07 +00:00
Treehugger Robot
325b033f85 Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422

Change-Id: I459cae5f473576dd3d9c4f8ee6fa9e7f5581ad75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 12:16:23 +00:00
Treehugger Robot
0960af0bf3 Merge "Mark DataUsageState as nullable to avoid potential NPE risk" 2022-09-15 11:56:51 +00:00
Shen Lin
eb627be0b4 Mark DataUsageState as nullable to avoid potential NPE risk
mDataUsageState is nullable in UnrestrictedDataAccessPreference.java, so we'd better
add a annotation to getDataUsageState(), and add a null-check before calling it.

Bug: 246828843

Test: manual and Robotest.
Change-Id: If7fea53ec7efd004391a09becdba5709ae686f40
2022-09-15 14:23:38 +08:00
TreeHugger Robot
93cb240fc3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1d302c6fd8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19947547

Change-Id: Iab1c5cba53b72345113da45fcb34a97136044a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 21:19:05 +00:00
Bill Yi
db799fa99c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1cf6de04d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19947547

Change-Id: Ie0d6bceed0363591b93a901548dfb7285657f318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 21:18:50 +00:00
TreeHugger Robot
1d302c6fd8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-14 20:45:40 +00:00
Zaiyue Xue
83ef9001e7 Merge changes from topic "accessibility1" into tm-qpr-dev am: 9b24df2c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19771692

Change-Id: I80680875b02983c58a9e3c324dc13e055ad75fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 06:09:40 +00:00
Zaiyue Xue
9479b18cf9 Support accessibility for battery chart (1) am: 9c962b03e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764112

Change-Id: If91f5422518ff8cc76dcc5c216a83a70dd7a337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 06:09:35 +00:00
Treehugger Robot
912fbfe668 [automerger skipped] Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee am: ca3213bf88 am: be35244362 am: 9c695a54f5 -s ours
am skip reason: Merged-In Ib225d185b6f15463f4fae809e0cdaa25920d52af with SHA-1 d55a7067aa is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309

Change-Id: I2afdae09b71b3be22538b6433cc44a615e7b8ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 05:56:52 +00:00
Treehugger Robot
78b58e08f5 Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f am: 227b8f0272 am: 4aea873647 am: 68a63e0280
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421

Change-Id: I0580d5dc5853ca5ed43a023aa5875750ed104f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 05:56:10 +00:00
Zaiyue Xue
9b24df2c38 Merge changes from topic "accessibility1" into tm-qpr-dev
* changes:
  Support accessibility for battery chart (4)
  Support accessibility for battery chart (3)
  Support accessibility for battery chart (2)
  Support accessibility for battery chart (1)
2022-09-14 05:46:17 +00:00
Treehugger Robot
9c695a54f5 Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee am: ca3213bf88 am: be35244362
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309

Change-Id: I11dd065ebb4f1092207fae5b2b78a62f26049a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 05:28:37 +00:00
Treehugger Robot
68a63e0280 Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f am: 227b8f0272 am: 4aea873647
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421

Change-Id: Iaad1dacbe8f2b477876bc0c12a49bafdfc4dd449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 05:28:17 +00:00
Treehugger Robot
be35244362 Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee am: ca3213bf88
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309

Change-Id: I2562d3ac792867e5b19539ce82137b3fc2dfe40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 04:58:18 +00:00
Treehugger Robot
4aea873647 Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f am: 227b8f0272
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421

Change-Id: I171aa7c274c51bf67f5a34740782c7ce78f88a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 04:57:58 +00:00
Treehugger Robot
ca3213bf88 Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309

Change-Id: I87f90878ea379a8f27bd57c13dc777803ec248a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 04:28:52 +00:00
Treehugger Robot
227b8f0272 Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421

Change-Id: Iad4eab5a28611ea7e8473f34ebb8af9b00158a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 04:28:19 +00:00
Treehugger Robot
8b0e08ecee Merge "Fix compile warnings due to non-varargs call of varargs method" 2022-09-14 04:16:30 +00:00
Treehugger Robot
8f793f5e4f Merge "Fix the IllegalArgumentException from RecyclerView" 2022-09-14 03:55:49 +00:00
Kuan Wang
93c0d0227b Add logging for count of shown / hidden apps in Battery Usage page. am: 676bcedb85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893207

Change-Id: I52977900a9f669fa7b31c2c72cbd5ec10646a28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 02:36:50 +00:00
Kuan Wang
676bcedb85 Add logging for count of shown / hidden apps in Battery Usage page.
Bug: 245455490
Test: manually
Change-Id: I7342e822f00f9a0aedcef592cae9809251518812
2022-09-14 02:09:16 +00:00
Bill Yi
c1cf6de04d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I08d15308d2597efc1683aa3ca74eaf6ca69bab47
2022-09-13 18:09:00 -07:00
Joshua Mccloskey
eafa298200 Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev am: 8ff0234717
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19929437

Change-Id: Ida9695d5f938e31f27888c7e1c90600b17fd0804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 23:46:06 +00:00
Joshua Mccloskey
8ff0234717 Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev 2022-09-13 23:13:15 +00:00
Automerger Merge Worker
a75ff5a3fb Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp am: 808da23434
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: If583d5d86e5fd65a3f0a8a8196c07d6f42bd6c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:26:30 +00:00
TreeHugger Robot
84fdac6e03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 9dbda868e8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I514e8480d1735ac3e449035f76f580b60901aac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:26:12 +00:00
Automerger Merge Worker
c570258cf0 Merge changes from topic "am-c8328431a47c4eebb006716640e11064" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 025c77a1e7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours am: 751b145c67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours am: 71ff19c956 -s ours
2022-09-13 20:21:05 +00:00
TreeHugger Robot
e4f166a93b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: 73cfa8885a -s ours am: 338c608012 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I6fab242aaf3eeafaaa122b72a466f4c044c3bb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:18:29 +00:00
Bill Yi
ef92baaca9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours am: fd8f0fee80 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: Ib99a187b3f747c5caa785e0b3600f22d639e2382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:18:15 +00:00
Bill Yi
c0d4a1358a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours am: 63fc658151 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032

Change-Id: I7f184e13907d499238356ab0448e2d3fa4847446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:18:03 +00:00
TreeHugger Robot
8c7f8c8de9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 025c77a1e7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: Id58fcf70171d1ef37b47d72907dc9cb8745422c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:17:09 +00:00
Bill Yi
d68b27fed7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours am: 751b145c67 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I42ec578c2c20de4c955d5bb69e02ab6064683942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:17:01 +00:00
Bill Yi
bf5d13159f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours am: 71ff19c956 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032

Change-Id: Ie3e390ae9167520d0d5c1dae5152fc99afda7c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:16:42 +00:00
Automerger Merge Worker
808da23434 Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
2022-09-13 18:54:26 +00:00
TreeHugger Robot
338c608012 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: 73cfa8885a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I463ef303e41f838db56589f2e01d07168fe79cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:51:51 +00:00
Bill Yi
fd8f0fee80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I7cb16d01b31890db0f2b5bc585120d9e52491b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:51:37 +00:00
TreeHugger Robot
9dbda868e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I22d4e5beabb84f2f7eb204df23f62aee984fd82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:51:32 +00:00
Bill Yi
63fc658151 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032

Change-Id: I204587378c45b54606f0faea021e442f0d5fffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:51:25 +00:00
Bill Yi
7334ac9765 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I54e65f48186d28ab71978cadb4d5aa6c9cb76ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:51:18 +00:00
Bill Yi
94b95cd07c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032

Change-Id: Ifb42aaa4bc5b011d9c5397096e341818c06989bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:51:06 +00:00
TreeHugger Robot
025c77a1e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: Ibe4b17fc3d476b322f38ec0dc27291568bb2a386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:50:49 +00:00
Bill Yi
751b145c67 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I66e82dbfe3e615faff30d30eca1a883e233ae660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:50:34 +00:00
Bill Yi
71ff19c956 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032

Change-Id: I003a3441594793b6ec60375d7fbe72d09cec5c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:50:24 +00:00
TreeHugger Robot
dd445a736a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I7dcc61b6ab4486462819e00f32ad0257eab4bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:11:40 +00:00
Bill Yi
ffd1ed3a00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I727cf5bfa8c148e0f589bd8c8e87aa8d59fd7c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:11:26 +00:00
Bill Yi
5020aeaf5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032

Change-Id: Ib510c3a81b652a330367a43560050f78531f34ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:11:14 +00:00
TreeHugger Robot
73cfa8885a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: I4b0bb9c5644698a69ea1bac97dab0d14a99163fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:11:07 +00:00