TreeHugger Robot
6dc9f825ec
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev
2021-02-03 17:24:05 +00:00
Weng Su
05d6fa9bcb
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-03 10:00:07 +00:00
Aaron Huang
68bdb8e8b8
Merge "Replace @hide API with public API" am: d52cff9b57
am: 3178dfc76a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a1b589342e82b22a5a5a960fe94feaca2505adc
2021-02-03 09:35:49 +00:00
Aaron Huang
3178dfc76a
Merge "Replace @hide API with public API" am: d52cff9b57
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a7897d737557abe1b7ede7f3931b2798e9610ab
2021-02-03 08:30:43 +00:00
Aaron Huang
d52cff9b57
Merge "Replace @hide API with public API"
2021-02-03 07:37:33 +00:00
Tsung-Mao Fang
211a2fff0d
Fix security issue
...
Settings#CredentialStorage could be overlaid to
trick user into clearing all credentials.
Disallow non-system overlay on activity.
Test: Trigger the debug apk again, and no overlay
Bug: 176753731
Change-Id: I657de039d667f5aee0941336e9361ae04f056c33
Merged-In: I657de039d667f5aee0941336e9361ae04f056c33
2021-02-03 06:44:56 +00:00
Bill Yi
d5c30053f5
[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420
-s ours
...
am skip reason: Change-Id Ia1d85c7136b824e69077ea06c68d142a706c2b11 with SHA-1 62f6b96b51
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13462033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I402b212594a9e9f4c118d94008f53177d3430361
2021-02-03 01:34:44 +00:00
Bill Yi
3e1fb17420
Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
...
Merged-In: Ia1d85c7136b824e69077ea06c68d142a706c2b11
Change-Id: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
2021-02-02 09:44:11 -08:00
Sarah Chin
123205e141
Update onSubscriptonOverride listener
...
Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: I9436b414608d7c964185d3d5c3f1f554c65b2c12
Merged-In: I9436b414608d7c964185d3d5c3f1f554c65b2c12
2021-02-01 18:33:34 -08:00
android-build-team Robot
06503bb046
Snap for 7116531 from 6ec886a0e3
to rvc-qpr3-release
...
Change-Id: I2feb84671d651829ba4d3e3c98ae04c11e2944e8
2021-02-02 00:24:23 +00:00
Tom Hsu
62f6b96b51
Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413809
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1d85c7136b824e69077ea06c68d142a706c2b11
2021-02-01 18:00:38 +00:00
Tom Hsu
6ec886a0e3
Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev
2021-02-01 17:26:47 +00:00
Aaron Huang
3bb961affd
Replace @hide API with public API
...
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.
Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d
Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
2021-02-01 19:16:23 +08:00
Weng Su
32d5d3a3a3
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-01 03:45:27 +00:00
Weng Su
faa5f6b5f6
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-01 03:42:15 +00:00
Weng Su
58b0f2d5b3
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-01 03:39:30 +00:00
Weng Su
eaeb50271e
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-01 03:34:01 +00:00
android-build-team Robot
51c6425868
Snap for 7112073 from 8865c08a85
to rvc-qpr3-release
...
Change-Id: I42be5e3d33a2ef3bc0b107eb2085f29557044eaa
2021-01-30 00:10:06 +00:00
Jiun-Yang Hsu
5da8b8b933
Merge "Create folder and OWNERS file for component test" am: cf231cad93
am: 1e2386b14b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8474a2ec62e212d932865419b866c42c2fbd8826
2021-01-29 23:43:05 +00:00
Jiun-Yang Hsu
1e2386b14b
Merge "Create folder and OWNERS file for component test" am: cf231cad93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60949e540697933fb138ab9d42d28657474cf136
2021-01-29 23:21:55 +00:00
Bill Yi
ce7427560d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8865c08a85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13435066
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic082f3c3eb9d0b8019e5684618193874bec23797
2021-01-29 20:41:29 +00:00
tom hsu
ae6a21427c
Avoid wrong telephonymanager with wrong sub id.
...
When initialized SimStatusDialogController, also create TelephonyManager
with sub id.
Bug: 174171839
Test: Manual test passed, see b/174171839#25
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimStatusDialogControllerTest passed
Change-Id: I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5
Merged-In: I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5
2021-01-29 14:31:02 +00:00
Jiun-Yang Hsu
cf231cad93
Merge "Create folder and OWNERS file for component test"
2021-01-29 12:48:32 +00:00
Jiun-Yang Hsu
2d0baa2c27
Create folder and OWNERS file for component test
...
Test: No test needed for creating folder and OWNERS
Change-Id: I6b1aff581df36a9c70309df2f2ce30d547a820d5
2021-01-29 09:01:30 +00:00
Bill Yi
8865c08a85
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I339425d596ff5e795d643ef724c65ab15e9438b7
2021-01-29 00:47:28 -08:00
Peter Wang
003e5dc7c2
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611
am: b4f375fdc4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4dc9ab9b5b990924ad06d206adb9950c3d95552
2021-01-27 22:24:35 +00:00
Peter Wang
b4f375fdc4
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia9cd23da0ae90f7f5c38fae54900b30e7ca12bad
2021-01-27 22:03:32 +00:00
Peter Wang
ffccb8a611
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA"
2021-01-27 21:39:51 +00:00
Yo Chiang
06bf3f1993
Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d
am: 7ac7030d49
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11d9849150aac649b704cfa129256deba6ac862b
2021-01-26 23:08:05 +00:00
Yo Chiang
7ac7030d49
Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I141aeae1f09a535aad5084f335c6ecbed696bfde
2021-01-26 11:34:53 +00:00
Yo Chiang
df58c6505d
Merge "Remove feature flag "settings_dynamic_system""
2021-01-26 10:53:54 +00:00
android-build-team Robot
07414f0e08
Snap for 7100068 from d70a7f7442
to rvc-qpr3-release
...
Change-Id: Ie94e3d73342ba140a9d49edfd378ac54bf0319c7
2021-01-24 22:09:53 +00:00
Bill Yi
195b137800
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d70a7f7442
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13397290
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c33d55aab01e1a4bfc168b995dd4f6bd0e452b3
2021-01-24 17:17:21 +00:00
Bill Yi
d70a7f7442
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31f2d5d2686777c42e311f92bc352efd150eb164
2021-01-24 00:41:08 -08:00
Peter Wang
7e8d24e073
Add an intent filter for MobileNetworkListActivity to enable access
...
from the LPA
Bug: 170507492
Test: Local
Change-Id: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
Merged-In: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
2021-01-19 22:21:45 -08:00
android-build-team Robot
d2e188ce75
Snap for 7085329 from d0e76c6245
to rvc-qpr3-release
...
Change-Id: I603c059f05949631da1921e22c4cb6662f0f2a46
2021-01-16 00:10:21 +00:00
Bill Yi
f1d3def534
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0e76c6245
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13354068
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09ad3498255e42ca23debb04cb6eed6cfb5bc488
2021-01-15 07:48:35 +00:00
Bill Yi
d0e76c6245
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I84b4dc12bad46b115fabd1c1dd6a756d5705a712
2021-01-14 22:07:28 -08:00
Yo Chiang
f1065e359f
Remove feature flag "settings_dynamic_system"
...
Bug: 176795908
Test: Presubmit
Test: DSULoader
Change-Id: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
Merged-In: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
2021-01-14 15:47:41 +08:00
android-build-team Robot
8822ac1014
Snap for 7080714 from bb974b69a0
to rvc-qpr3-release
...
Change-Id: I9c0a48ef0b28a0f2df3601201abab02c6353704c
2021-01-14 00:11:58 +00:00
TreeHugger Robot
a8b695c31f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bb974b69a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13329654
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I890c875c147001a6d2318b95f7091327e9063c78
2021-01-13 18:42:26 +00:00
TreeHugger Robot
bb974b69a0
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-01-13 17:58:40 +00:00
Bill Yi
129b3b91d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaea90af3fb9836088e85de6a8a692b965b4419fa
2021-01-12 23:26:57 -08:00
android-build-team Robot
cde220a546
Snap for 7077839 from 07bb0280f6
to rvc-qpr3-release
...
Change-Id: I48c10ed7610648a4fa2c84d5a15198a471188024
2021-01-13 00:29:38 +00:00
Benjamin Franz
04bbd87254
Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22
am: 9229794727
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91b4bd641afa6811cb5837763e60fbfd0decb82e
2021-01-12 16:41:53 +00:00
Benjamin Franz
9229794727
Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4946065f619aac04cf681c310bfe04a6e5e68099
2021-01-12 16:22:18 +00:00
Benjamin Franz
39a920dd22
Merge "Update constructor usage for CompatibilityChangeInfo"
2021-01-12 15:38:01 +00:00
Alisher Alikhodjaev
a75273fe12
Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev am: 07bb0280f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13298728
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia942e29d02f120905558779723fdb4a7b00117f5
2021-01-11 23:31:02 +00:00
Alisher Alikhodjaev
07bb0280f6
Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev
2021-01-11 23:08:40 +00:00
android-build-team Robot
337559c32e
Snap for 7072549 from 4046f5c134
to rvc-qpr3-release
...
Change-Id: If395515f9caab0933c644283d185fb96bb907e21
2021-01-09 22:10:26 +00:00