Commit Graph

53056 Commits

Author SHA1 Message Date
android-build-team Robot
e0b5309d49 Snap for 6313343 from bd8bbca27c to qt-qpr3-release
Change-Id: I2b959680bf082e3f99df54a556a9792f51c5662c
2020-03-19 23:14:23 +00:00
Sarah Chin
bd8bbca27c Merge "5G meteredness for telephony framework" into qt-qpr1-dev 2020-03-19 19:11:00 +00:00
android-build-team Robot
980f157971 Snap for 6304846 from 8f23d00553 to qt-qpr3-release
Change-Id: I9ced70738973d988a30298ccf3d92ae18c0b1836
2020-03-17 23:01:59 +00:00
Sarah Chin
20974b6814 5G meteredness for telephony framework
Add listener for SubscriptionPlans changed

Bug: 151630253
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
2020-03-17 18:47:07 +00:00
Bill Yi
8f23d00553 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
2020-03-17 04:18:33 -07:00
android-build-team Robot
9549063f25 Snap for 6300693 from d49c677499 to qt-qpr3-release
Change-Id: I9e283214433b0889d64323134526bb10bda2e2b9
2020-03-16 23:03:21 +00:00
Bill Yi
d49c677499 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
2020-03-16 08:20:15 -07:00
android-build-team Robot
9580c43d65 Snap for 6290189 from 8697de6be3 to qt-qpr3-release
Change-Id: Id8021dc211067bafce6795ccd294a4632be26e22
2020-03-12 23:08:09 +00:00
TreeHugger Robot
8697de6be3 Merge "DO NOT MERGE" into qt-qpr1-dev 2020-03-12 10:36:01 +00:00
Automerger Merge Worker
5f2520f685 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I19964afedd126b92b35977cc0a97abe1b8fb9ffc
2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev 2020-03-12 01:35:21 +00:00
android-build-team Robot
e2c224b4ce Snap for 6285821 from fe302e4867 to qt-qpr3-release
Change-Id: I4391e16350a5d2e3020d5e6689a7b8bbfc055875
2020-03-11 23:18:00 +00:00
Automerger Merge Worker
18d9d24ee3 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I0f6d8eeec8469cfe05b36bfbf27687be2973108a
2020-03-11 20:29:24 +00:00
Automerger Merge Worker
31933bea45 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0716de563c854768010f78b01ee4cbd546e99a0
2020-03-11 20:17:25 +00:00
Automerger Merge Worker
fe302e4867 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
Change-Id: I0b9346370cf28648659d38a6a2bdeb0f893195f5
2020-03-11 20:05:37 +00:00
Automerger Merge Worker
19ff9101ee RESTRICT AUTOMERGE am: 077dd9b07f
Change-Id: I73f9a68326f6e6c477fc43eeb84b3349f519b658
2020-03-11 20:05:35 +00:00
Automerger Merge Worker
a3ddb0c4fb [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I5ec3ba82e851a69ab1d7aff75603ad6a674661fd
2020-03-11 20:05:00 +00:00
TreeHugger Robot
5e788604c2 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev 2020-03-11 17:51:30 +00:00
Christopher Tate
36f182159f DO NOT MERGE - Track framework changes to crashApplication
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -07:00
Kenny Guy
37295f86bf DO NOT MERGE
Update battery manager toggle to support on / off summary.

Screenshots attached to the bug.

Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba)
2020-03-10 16:10:29 +00:00
android-build-team Robot
f6090fab5e Snap for 6271995 from 12ed043fdb to qt-qpr3-release
Change-Id: I963711441da25323f570f6f94fcbb3cfa3f73413
2020-03-07 00:09:01 +00:00
Chris Tate
12ed043fdb Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3

Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...

Change-Id: Ic68e376aa93c5c22a499d87f001bd22314c3f46e
2020-03-06 03:54:52 +00:00
Automerger Merge Worker
86ce68877f DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279
Change-Id: Ibe465291626661a7bcd4ad38e11ff1525fbab512
2020-03-06 01:35:03 +00:00
android-build-team Robot
1e36c5247c Snap for 6263357 from 3779025590 to qt-qpr3-release
Change-Id: I7c787d5f362b84d7962c759b3d404f39f4b92d40
2020-03-05 00:08:25 +00:00
TreeHugger Robot
3779025590 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-03-04 19:24:28 +00:00
Bill Yi
8e8a5a1a2c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I3e95725552e5510a27025a8315fe4ec69dd2bfd8
2020-03-03 19:10:03 -08:00
Arc Wang
9e46a0bc93 [Wi-Fi] Ignore incorrect user certificates
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
2020-03-02 22:28:46 +08:00
android-build-team Robot
12d6d60829 Snap for 6248514 from 594a5c71f5 to qt-qpr3-release
Change-Id: Id4c8ac6dad2016bc413e4bf580f41ebf56e2021d
2020-02-29 00:17:38 +00:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00
android-build-team Robot
ad1d0ce95c Snap for 6244512 from efe4cc3db4 to qt-qpr3-release
Change-Id: I097a0695687c688209546e7657029b4fcdb0e1e6
2020-02-28 00:08:03 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Mill Chen
101c9be6c1 RESTRICT AUTOMERGE
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
Merged-In: I8070de79a83350d1658efcb19e983669dad0e673
2020-02-26 16:04:35 +00:00
Mill Chen
8d47205577 RESTRICT AUTOMERGE
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
Merged-In: I8070de79a83350d1658efcb19e983669dad0e673
2020-02-26 16:04:19 +00:00
Mill Chen
077dd9b07f RESTRICT AUTOMERGE
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
2020-02-26 13:09:55 +00:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
2020-02-26 18:23:31 +08:00
android-build-team Robot
90f9bbc0ba Snap for 6232927 from ef009cc832 to qt-qpr3-release
Change-Id: I56c29b92df8fdb50c43560ce55f00bdeeb9134da
2020-02-25 02:23:03 +00:00
Raff Tsai
ef009cc832 Fix volume panel crashing
slider position is smaller than min value causes the exception.
Fixed by limit the position within min and max value.

Fixes: 148270968
Fixes: 149973990
Test: manual
Change-Id: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
(cherry picked from commit fcd9f1a870)
Merged-In: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
2020-02-24 07:04:03 +00:00
android-build-team Robot
ea564d6754 Snap for 6209883 from 936ebd0367 to qt-qpr3-release
Change-Id: Id6368cb21bafd157fbe22818d32e75c35eb70980
2020-02-15 02:26:36 +00:00
TreeHugger Robot
936ebd0367 Merge "Set the max length of user name field in Profile info" into qt-qpr1-dev 2020-02-14 06:20:29 +00:00
android-build-team Robot
22e80e4a1e Snap for 6206628 from f8396c5cc0 to qt-qpr3-release
Change-Id: I7511316c90b2c126b9d4d4557e4fb16c76f8f1db
2020-02-14 02:06:40 +00:00
Yanting Yang
f8396c5cc0 RESTRICT AUTOMERGE
Fix NPE of launching Settings with malicious URL

Add SafetyNet logging for tracing.

Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
2020-02-11 16:17:08 +08:00
android-build-team Robot
9492e827f4 Snap for 6193784 from d41b716f6c to qt-qpr3-release
Change-Id: Ib26cdd4d25649eb69ef75edd40dd230c6f472734
2020-02-10 00:17:39 +00:00
Bill Yi
d41b716f6c Import translations. DO NOT MERGE
Change-Id: I802d73dcc63414bed8b9b5bba8ff87ad38c22ebc
Auto-generated-cl: translation import
2020-02-08 01:07:28 -08:00
android-build-team Robot
a5db63b471 Snap for 6191454 from b5dcd35969 to qt-qpr3-release
Change-Id: I6034d0bfad77f1aa85b50abb814dbfa7684507a3
2020-02-08 02:07:08 +00:00
android-build-team Robot
7fbec9e25d Snap for 6188276 from 74ded43527 to qt-qpr3-release
Change-Id: I264c1faafd174a36d91a8ee8158fae57b0241db5
2020-02-07 02:29:04 +00:00
SongFerngWang
b5dcd35969 Bug:PreferredNetworkModePreferenceController.java not being refreshed
Bug: 146594872
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)

Change-Id: Ic3579e630c1d9422d7105a2d8fb619409a5823d6
Merged-In: Ib5cc06cdbfd2fa70cd115d70337b21500e362da6
2020-02-06 17:11:48 +08:00
Christopher Tate
4a89abe279 DO NOT MERGE - Track framework changes to crashApplication API
Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
2020-02-04 17:48:06 -08:00
Jason Chiu
59f7342986 Set the max length of user name field in Profile info
Settings may crash when entering a very long user name.

Fixes: 136005061
Test: manual, robotest
Change-Id: Ica17297588fc6b84ef111ef00017afb27360acd3
Merged-In: Ica17297588fc6b84ef111ef00017afb27360acd3
(cherry picked from commit ca2bbc0685)
2020-02-03 10:25:55 +00:00
Arc Wang
f3848729b4 [Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS
To improve security.

Bug: 143601727
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idb93d5ca1eb81bdcc2bc139679f72053161e3e35
Merged-In: I0cb1ceda6d89a52224f80ea5ffd1af709a6acace
2020-02-03 11:21:30 +08:00