PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,507 Commits 1 Branch 0 Tags
21cea68a243577b647e84d4cbb5ddb2bbddb7eb2
Commit Graph

71507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allen Su
ba38382627 Merge "Change carrier config" 2020-12-22 00:26:52 +00:00
Treehugger Robot
892c868c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica30d902800493f8a4f5d36365de2d4dca8e77b7
 2020-12-20 19:11:29 +00:00
Treehugger Robot
b5a0cf9253 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17af19488236d2b4376dc523c06c5ea27c67b616
 2020-12-20 19:07:31 +00:00
Treehugger Robot
3d0be7ca05 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:43:29 +00:00
Treehugger Robot
5ae81b2084 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:38:59 +00:00
Bill Yi
cb8819b42f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6d96e565647fb0bbbc643834aebb719fbc2d843
 2020-12-20 12:41:07 +00:00
Bill Yi
c741c74967 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7493562157c18c8a1ad4295d310a33400d90b20
 2020-12-20 12:14:03 +00:00
Jeremy Goldman
2b1b458f1a Merge "Owners updates" am: 59465ee9d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de2ba79486a4ec7df4962ca22ea21162c9f7ba3
 2020-12-17 12:59:18 +00:00
Jeremy Goldman
59465ee9d3 Merge "Owners updates" 2020-12-17 12:24:01 +00:00
Xiangyu/Malcolm Chen
04d95b6e8e Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37c0f54c42db2ba1338238d6477a2e3b88c20e85
 2020-12-16 19:30:17 +00:00
Xiangyu/Malcolm Chen
33657f8d44 Merge "Automatically dismiss SIM combination warnings and selection dialogs." 2020-12-16 19:01:52 +00:00
Jeremy Goldman
6efeeaafec Owners updates 
Add goldmanj to tests/unit for junit migration and
utility library creation
Add connectivity settings eng to settings/datausage.

Test: N/A, just owners update
Change-Id: I182ad6093677dc151b171d9e5aaa15cdd353c474
 2020-12-16 10:40:49 +00:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs. 
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
 2020-12-15 16:45:27 -08:00
android-build-team Robot
81509558db Merge cherrypicks of [13231586, 13231437, 13231588, 13230397, 13230399, 13231350, 13231351, 13231354, 13231356, 13231439, 13231441, 13231358, 13231443, 13231360, 13231030, 13231457, 13230243, 13231032, 13231725, 13230838, 13231034, 13230840, 13230842, 13231361, 13231363, 13231745, 13231458, 13231747, 13231749, 13231751, 13229580, 13229582, 13231589, 13231591, 13231764, 13230400, 13230402, 13231784, 13231786, 13231788, 13231790] into rvc-qpr1-release 
Change-Id: Iaa4c4134161d41c43126a821177254ae2c570783
 2020-12-15 21:47:42 +00:00
Chris Manton
f065b87433 Add bluetooth package to permission request intent 
Limit the component that may resolve this intent to the
bluetooth package.

Bug: 158219161
Test: Security Fix
Tag: #security
Change-Id: If732f940a7aa256f5975349118e8eb6cf5584676
(cherry picked from commit 1951d27669)
 2020-12-15 21:46:25 +00:00
Jakub Pawlowski
763a4d5967 Prevent overlay drawing on top of Bluetooth activity dialog 
Bug: 168504491
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
(cherry picked from commit 4f7edf692f)
 2020-12-15 21:46:21 +00:00
Eugene Susla
8cef97cb2b RESTRICT AUTOMERGE 
Prevent non-system overlays from showing over notification listener consent dialog

Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
(cherry picked from commit bfa7a75545)
 2020-12-15 21:46:16 +00:00
Diego Vela
8403231bbb Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b27110024a7422343149b0eff00ed97bc726419
 2020-12-14 22:24:05 +00:00
Diego Vela
a2e406ed85 Merge "Revert^2 "Add <uses-library> information."" 2020-12-14 22:09:58 +00:00
Diego Vela
1ef19adf52 Revert^2 "Add <uses-library> information." 
7f1950928f

Change-Id: I8d3d6fee8e5a2b6eb337abb53f21b9b909b007c9
 2020-12-14 22:05:04 +00:00
Diego Vela
9d61c8a23d Merge "Revert "Add <uses-library> information."" am: 54b741096b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54a0349bf3590b40165d2205171e9c58a0a7b6f
 2020-12-14 21:59:32 +00:00
Diego Vela
54b741096b Merge "Revert "Add <uses-library> information."" 2020-12-14 21:49:14 +00:00
Diego Vela
7f1950928f Revert "Add <uses-library> information." 
Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

Change-Id: If1ca723c357ba3e8d9343fbb0f5d980d1e7ca1fb
 2020-12-14 21:14:24 +00:00
allenwtsu
91f11e9a47 Change carrier config 
Use KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL instead of
KEY_USE_RCS_PRESENCE_BOOL

Bug: 173828080
Test: build pass
Change-Id: I384686bd073a00341f4e552b71b24798619502fa
 2020-12-15 00:28:20 +08:00
Ulyana Trafimovich
b10b31bcad Merge "Add <uses-library> information." am: 4bb99a788a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86e3713c8ba955f4c655d3ea25f7c07b248ce3d8
 2020-12-10 10:34:10 +00:00
Ulyana Trafimovich
4bb99a788a Merge "Add <uses-library> information." 2020-12-10 10:19:15 +00:00
Xin Li
ee06524dbe [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5 -s ours 
am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2389a3b1ff505dc0a8cc84b1d9b21dd7f6c01b
 2020-12-10 03:05:02 +00:00
Xin Li
6e252c4cd5 Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:22 +00:00
Xin Li
540fd7333f DO NOT MERGE - Merge Android R QPR1 
Bug: 172690556
Merged-In: Id2d9c4f56beae280e6299b6695185577a1521345
Change-Id: Ice3069b89e1a47121d1920aa3e45fbddbed5678e
 2020-12-08 23:49:38 -08:00
Ulya Trafimovich
202ca49dfe Add <uses-library> information. 
The required <uses-library> "org.apache.http.legacy" is in the manifest
for Settings. It is necessary to explicitly add it to `uses_libs`
because it is not among the app dependencies (so Soong does not add it
automatically to the manifest_fixer). It also doesn't add it as a
compatibility library because the target API level for the app is not
below 28.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Test: m out/soong/.intermediates/packages/apps/Settings/Settings/android_common/manifest_check/AndroidManifest.xml
Test: m out/soong/.intermediates/packages/apps/Settings/tests/robotests/SettingsRoboTestStub/android_common/manifest_check/AndroidManifest.xm
Change-Id: Id5d5fe1dff68cf6fce667a00e35710cf0e667d02
 2020-12-08 12:09:53 +00:00
Remi NGUYEN VAN
f40f71ccf1 Replace isWeaklyValidatedHostname with guava 
The guava implementation is more accurate than the basic NetworkUtils
implementation.
NetworkUtils is being moved to its own JAR and will not be available
from Settings.

Bug: 174436414
Test: m
      Wrote test for isWeaklyValidatedHostname, verified it passes with
      guava
Change-Id: I1d01f2beba36009e17f651652e2d7f57be5aa398
 2020-12-08 14:02:17 +09:00
Xin Li
07ccb42665 DO NOT MERGE - Merge RQ1A.201205.011 
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
 2020-12-07 00:39:43 -08:00
Xin Li
835215964f DO NOT MERGE - Mark RQ1A.201004.001 as merged 
Bug: 172690556
Change-Id: I32dff08f7cea0c4e645c653d1b63945b775b1078
 2020-12-06 14:43:21 -08:00
Treehugger Robot
11b0105b98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iafacdf7b241ac8c7f4aa65861f885868bc4578dc
 2020-12-06 16:38:51 +00:00
TreeHugger Robot
e5350c9e20 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 16:22:59 +00:00
Treehugger Robot
4d181cc04f Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 16:05:53 +00:00
Treehugger Robot
7c2ed6be16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I215cb3c7612b323dd67437d31dfee850b8a12227
 2020-12-06 15:48:44 +00:00
Treehugger Robot
97bc1fcff7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:36:04 +00:00
Bill Yi
10caa304c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e8d356f279ba834c5493badcb5a0f8e7b916c6c
 2020-12-06 12:37:23 +00:00
Bill Yi
b9a5248b95 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I518f13a32c239dfc98b053ad002d31577cd41a9a
 2020-12-06 12:10:17 +00:00
Bill Yi
a815a12c40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I267bdda4fe2a243d548b1842e9a08950e61069c0
 2020-12-05 16:49:34 -08:00
TreeHugger Robot
448ec6b5fe Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-05 01:04:28 +00:00
Bill Yi
d890249a20 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I106d32515484c4ad081b1a0bc2bf01d79b5097ad
 2020-12-04 03:58:02 -08:00
Bill Yi
d0f3a4ca19 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d0e585779a9e28de3aeb1eb8ca3246a09b717d4
 2020-12-04 03:09:46 -08:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
 2020-12-02 00:29:15 -08:00
Treehugger Robot
0cf0f58ceb Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029

Change-Id: Ib92cfdb77164a7b24e65b2a028f963b606144096
 2020-12-01 02:41:37 +00:00
Treehugger Robot
4f8b47e5c2 Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." 2020-12-01 01:59:21 +00:00
Joseph Murphy
6d78a33475 Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class. 
Bug: b/174168302
Change-Id: I765e3f6c7f8ef2f2734862e75513e73353fea4c0
 2020-12-01 00:25:00 +00:00
Bonian Chen
d9ba9cf45b Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918

Change-Id: I84f2911036c321bb2129e4df82125c9fe3b54bc7
 2020-11-26 08:24:12 +00:00
Bonian Chen
80a69cb5e0 Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917

Change-Id: I3c19b17b3daa801a4fac4f4cb5742113e3602ba5
 2020-11-26 08:23:25 +00:00